bzr commit into mysql-5.1 branch (chad:2733) Bug#37312

[Chad MILLER]

#At file:///Users/cmiller/work/mysqlbzr/5.1-bugteam--bug37312/

 2733 Chad MILLER	2008-09-08
      Bug#37312: Make test binlog_{row,stm}_innodb_stat more robust
      
      The size of the Innodb_buffer_pool_pages differs by one byte on row versus statement
      log, so neuter the last position of the stringified decimal representation.  Innobase
      says the size isn't very important in any case.
      
      Also, split out the "mixed" format to its own file, as mtr seems to dislike having only 
      stm and row but not mix.
added:
  mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result
  mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test
modified:
  mysql-test/extra/binlog_tests/innodb_stat.test
  mysql-test/suite/binlog/r/binlog_row_innodb_stat.result
  mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result
  mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test

=== modified file 'mysql-test/extra/binlog_tests/innodb_stat.test'
--- a/mysql-test/extra/binlog_tests/innodb_stat.test	2006-05-24 08:28:24 +0000
+++ b/mysql-test/extra/binlog_tests/innodb_stat.test	2008-09-08 20:23:55 +0000
@@ -41,6 +41,7 @@ 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";

=== added file 'mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result'
--- a/mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result	2008-09-08 20:23:55 +0000
@@ -0,0 +1,39 @@
+show status like "binlog_cache_use";
+Variable_name	Value
+Binlog_cache_use	0
+show status like "binlog_cache_disk_use";
+Variable_name	Value
+Binlog_cache_disk_use	0
+drop table if exists t1;
+create table t1 (a int) engine=innodb;
+show status like "binlog_cache_use";
+Variable_name	Value
+Binlog_cache_use	1
+show status like "binlog_cache_disk_use";
+Variable_name	Value
+Binlog_cache_disk_use	1
+begin;
+delete from t1;
+commit;
+show status like "binlog_cache_use";
+Variable_name	Value
+Binlog_cache_use	2
+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	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/binlog/r/binlog_row_innodb_stat.result	2008-09-08 20:23:55 +0000
@@ -24,7 +24,7 @@ Binlog_cache_disk_use	1
 drop table t1;
 show status like "Innodb_buffer_pool_pages_total";
 Variable_name	Value
-Innodb_buffer_pool_pages_total	512
+Innodb_buffer_pool_pages_total	51_
 show status like "Innodb_page_size";
 Variable_name	Value
 Innodb_page_size	16384

=== modified file 'mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result'
--- a/mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result	2008-09-08 20:23:55 +0000
@@ -24,7 +24,7 @@ Binlog_cache_disk_use	1
 drop table t1;
 show status like "Innodb_buffer_pool_pages_total";
 Variable_name	Value
-Innodb_buffer_pool_pages_total	512
+Innodb_buffer_pool_pages_total	51_
 show status like "Innodb_page_size";
 Variable_name	Value
 Innodb_page_size	16384

=== added file 'mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test'
--- a/mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test	2008-09-08 20:23:55 +0000
@@ -0,0 +1,5 @@
+# This is a wrapper for binlog.test so that the same test case can be used 
+# For both statement and row based bin logs 9/19/2005 [jbm]
+
+-- source include/have_binlog_format_mixed.inc
+-- source extra/binlog_tests/innodb_stat.test

=== modified file 'mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test'
--- a/mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test	2008-09-08 20:23:55 +0000
@@ -1,5 +1,5 @@
 # This is a wrapper for binlog.test so that the same test case can be used 
 # For both statement and row based bin logs 9/19/2005 [jbm]
 
--- source include/have_binlog_format_mixed_or_statement.inc
+-- source include/have_binlog_format_statement.inc
 -- source extra/binlog_tests/innodb_stat.test