bzr push into mysql-6.0 branch (patrick.crews:2820 to 2821) Bug#37312

[Patrick Crews]

 2821 Patrick Crews	2008-09-22 [merge]
      Bug#37312 Make tests binlog_row_innodb_stat and binlog_stm_innodb_stat more robust
      
      Upmerge 5.1-> 6.0
modified:
  mysql-test/extra/binlog_tests/innodb_stat.test
  mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result
  mysql-test/suite/binlog/r/binlog_row_innodb_stat.result
  mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result

 2820 Mattias Jonsson	2008-09-20 [merge]
      merge
modified:
  mysql-test/r/partition_error.result
  mysql-test/t/partition_error.test
  sql/handler.cc

=== modified file 'mysql-test/extra/binlog_tests/innodb_stat.test'
--- a/mysql-test/extra/binlog_tests/innodb_stat.test	2008-09-08 20:23:55 +0000
+++ b/mysql-test/extra/binlog_tests/innodb_stat.test	2008-09-22 19:15:52 +0000
@@ -7,6 +7,7 @@
 # Actually this test has nothing to do with innodb per se, it just requires
 # transactional table. 
 #
+flush status;
 show status like "binlog_cache_use";
 show status like "binlog_cache_disk_use";
 --disable_warnings
@@ -38,13 +39,3 @@ commit;
 show status like "binlog_cache_use";
 show status like "binlog_cache_disk_use";
 drop table t1;
-
-# Test for testable InnoDB status variables. This test
-# uses previous ones(pages_created, rows_deleted, ...).
--- replace_regex /51[12]/51_/
-show status like "Innodb_buffer_pool_pages_total";
-show status like "Innodb_page_size";
-show status like "Innodb_rows_deleted";
-show status like "Innodb_rows_inserted";
-show status like "Innodb_rows_updated";
-

=== modified file 'mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result'
--- a/mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result	2008-09-08 20:23:55 +0000
+++ b/mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result	2008-09-22 19:15:52 +0000
@@ -1,3 +1,4 @@
+flush status;
 show status like "binlog_cache_use";
 Variable_name	Value
 Binlog_cache_use	0
@@ -22,18 +23,3 @@ show status like "binlog_cache_disk_use"
 Variable_name	Value
 Binlog_cache_disk_use	1
 drop table t1;
-show status like "Innodb_buffer_pool_pages_total";
-Variable_name	Value
-Innodb_buffer_pool_pages_total	51_
-show status like "Innodb_page_size";
-Variable_name	Value
-Innodb_page_size	16384
-show status like "Innodb_rows_deleted";
-Variable_name	Value
-Innodb_rows_deleted	2000
-show status like "Innodb_rows_inserted";
-Variable_name	Value
-Innodb_rows_inserted	2000
-show status like "Innodb_rows_updated";
-Variable_name	Value
-Innodb_rows_updated	0

=== modified file 'mysql-test/suite/binlog/r/binlog_row_innodb_stat.result'
--- a/mysql-test/suite/binlog/r/binlog_row_innodb_stat.result	2008-09-08 20:23:55 +0000
+++ b/mysql-test/suite/binlog/r/binlog_row_innodb_stat.result	2008-09-22 19:15:52 +0000
@@ -1,3 +1,4 @@
+flush status;
 show status like "binlog_cache_use";
 Variable_name	Value
 Binlog_cache_use	0
@@ -22,18 +23,3 @@ show status like "binlog_cache_disk_use"
 Variable_name	Value
 Binlog_cache_disk_use	1
 drop table t1;
-show status like "Innodb_buffer_pool_pages_total";
-Variable_name	Value
-Innodb_buffer_pool_pages_total	51_
-show status like "Innodb_page_size";
-Variable_name	Value
-Innodb_page_size	16384
-show status like "Innodb_rows_deleted";
-Variable_name	Value
-Innodb_rows_deleted	2000
-show status like "Innodb_rows_inserted";
-Variable_name	Value
-Innodb_rows_inserted	2000
-show status like "Innodb_rows_updated";
-Variable_name	Value
-Innodb_rows_updated	0

=== modified file 'mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result'
--- a/mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result	2008-09-08 20:23:55 +0000
+++ b/mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result	2008-09-22 19:15:52 +0000
@@ -1,3 +1,4 @@
+flush status;
 show status like "binlog_cache_use";
 Variable_name	Value
 Binlog_cache_use	0
@@ -22,18 +23,3 @@ show status like "binlog_cache_disk_use"
 Variable_name	Value
 Binlog_cache_disk_use	1
 drop table t1;
-show status like "Innodb_buffer_pool_pages_total";
-Variable_name	Value
-Innodb_buffer_pool_pages_total	51_
-show status like "Innodb_page_size";
-Variable_name	Value
-Innodb_page_size	16384
-show status like "Innodb_rows_deleted";
-Variable_name	Value
-Innodb_rows_deleted	2000
-show status like "Innodb_rows_inserted";
-Variable_name	Value
-Innodb_rows_inserted	2000
-show status like "Innodb_rows_updated";
-Variable_name	Value
-Innodb_rows_updated	0