From: Jonathan Miller Date: September 19 2005 9:58pm Subject: bk commit into 5.0 tree (jmiller:1.1983) List-Archive: http://lists.mysql.com/internals/30069 Message-Id: <200509192158.j8JLwU1a004897@ndb08.mysql.com> Below is the list of changes that have just been committed into a local 5.0 repository of ndbdev. When ndbdev does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet 1.1983 05/09/19 23:58:23 jmiller@stripped +11 -0 Additional test work for wl1012 mysql-test/t/binlog_stm_mix_innodb_myisam.test 1.1 05/09/19 23:57:20 jmiller@stripped +5 -0 mysql-test/t/binlog_stm_insert_select.test 1.1 05/09/19 23:57:20 jmiller@stripped +5 -0 mysql-test/t/binlog_stm_innodb_stat.test 1.1 05/09/19 23:57:20 jmiller@stripped +5 -0 mysql-test/t/binlog_stm_drop_tmp_tbl.test 1.1 05/09/19 23:57:20 jmiller@stripped +5 -0 mysql-test/t/binlog_stm_ctype_ucs.test 1.1 05/09/19 23:57:20 jmiller@stripped +6 -0 mysql-test/t/binlog_stm_ctype_cp932.test 1.1 05/09/19 23:57:20 jmiller@stripped +5 -0 mysql-test/t/binlog_stm_blackhole.test 1.1 05/09/19 23:57:20 jmiller@stripped +5 -0 mysql-test/t/binlog_stm_mix_innodb_myisam.test 1.0 05/09/19 23:57:20 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/binlog_stm_mix_innodb_myisam.test mysql-test/t/binlog_stm_insert_select.test 1.0 05/09/19 23:57:20 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/binlog_stm_insert_select.test mysql-test/t/binlog_stm_innodb_stat.test 1.0 05/09/19 23:57:20 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/binlog_stm_innodb_stat.test mysql-test/t/binlog_stm_drop_tmp_tbl.test 1.0 05/09/19 23:57:20 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/binlog_stm_drop_tmp_tbl.test mysql-test/t/binlog_stm_ctype_ucs.test 1.0 05/09/19 23:57:20 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/binlog_stm_ctype_ucs.test mysql-test/t/binlog_stm_ctype_cp932.test 1.0 05/09/19 23:57:20 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/binlog_stm_ctype_cp932.test mysql-test/t/binlog_stm_blackhole.test 1.0 05/09/19 23:57:20 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/binlog_stm_blackhole.test mysql-test/r/binlog_stm_innodb_stat.result 1.3 05/09/19 23:49:00 jmiller@stripped +4 -4 update result mysql-test/t/binlog_stm_binlog.test 1.1 05/09/19 23:35:06 jmiller@stripped +5 -0 mysql-test/t/binlog_stm_binlog.test 1.0 05/09/19 23:35:06 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/binlog_stm_binlog.test mysql-test/t/binlog_stm_binlog-master.opt 1.2 05/09/19 23:34:20 jmiller@stripped +0 -0 Rename: mysql-test/t/binlog-master.opt -> mysql-test/t/binlog_stm_binlog-master.opt mysql-test/t/rpl_bit.test 1.3 05/09/19 23:24:16 jmiller@stripped +1 -1 Removed inlude for statement only since Tomas patch fixed rbr issue. # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: jmiller # Host: ndb08.mysql.com # Root: /home/ndbdev/jmiller/mysql-5.0-wl1012 --- New file --- +++ mysql-test/t/binlog_stm_binlog.test 05/09/19 23:35:06 # 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_statement.inc -- source extra/binlog_tests/binlog.test --- New file --- +++ mysql-test/t/binlog_stm_blackhole.test 05/09/19 23:57:20 # 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_statement.inc -- source extra/binlog_tests/blackhole.test --- New file --- +++ mysql-test/t/binlog_stm_ctype_cp932.test 05/09/19 23:57:20 # 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_statement.inc -- source extra/binlog_tests/ctype_cp932.test --- New file --- +++ mysql-test/t/binlog_stm_ctype_ucs.test 05/09/19 23:57:20 # 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_statement.inc -- source extra/binlog_tests/ctype_ucs_binlog.test --- New file --- +++ mysql-test/t/binlog_stm_drop_tmp_tbl.test 05/09/19 23:57:20 # 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_statement.inc -- source extra/binlog_tests/drop_temp_table.test --- New file --- +++ mysql-test/t/binlog_stm_innodb_stat.test 05/09/19 23:57:20 # 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_statement.inc -- source extra/binlog_tests/innodb_stat.test --- New file --- +++ mysql-test/t/binlog_stm_insert_select.test 05/09/19 23:57:20 # 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_statement.inc -- source extra/binlog_tests/insert_select-binlog.test --- New file --- +++ mysql-test/t/binlog_stm_mix_innodb_myisam.test 05/09/19 23:57:20 # 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_statement.inc -- source extra/binlog_tests/mix_innodb_myisam_binlog.test --- 1.2/mysql-test/t/rpl_bit.test 2005-09-15 22:39:03 +02:00 +++ 1.3/mysql-test/t/rpl_bit.test 2005-09-19 23:24:16 +02:00 @@ -7,7 +7,7 @@ # Not running on RBR currently due to 13152 # Includes ---source include/have_binlog_format_statement.inc +#--source include/have_binlog_format_statement.inc -- source include/master-slave.inc --- 1.2/mysql-test/r/binlog_stm_innodb_stat.result 2005-09-19 16:11:55 +02:00 +++ 1.3/mysql-test/r/binlog_stm_innodb_stat.result 2005-09-19 23:49:00 +02:00 @@ -1,13 +1,13 @@ show status like "binlog_cache_use"; Variable_name Value -Binlog_cache_use 2 +Binlog_cache_use 0 show status like "binlog_cache_disk_use"; Variable_name Value Binlog_cache_disk_use 0 create table t1 (a int) engine=innodb; show status like "binlog_cache_use"; Variable_name Value -Binlog_cache_use 3 +Binlog_cache_use 1 show status like "binlog_cache_disk_use"; Variable_name Value Binlog_cache_disk_use 1 @@ -16,7 +16,7 @@ commit; show status like "binlog_cache_use"; Variable_name Value -Binlog_cache_use 4 +Binlog_cache_use 2 show status like "binlog_cache_disk_use"; Variable_name Value Binlog_cache_disk_use 1 @@ -32,7 +32,7 @@ Innodb_rows_deleted 2000 show status like "Innodb_rows_inserted"; Variable_name Value -Innodb_rows_inserted 2028 +Innodb_rows_inserted 2000 show status like "Innodb_rows_updated"; Variable_name Value Innodb_rows_updated 0