From 51a99d70e92ca9fd1e8e9889a531ab86846d4062 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 27 Feb 2008 15:18:27 +0100 Subject: [PATCH] Fix pushbuild errors. mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test: The test unnecessarily refused to run in non-debug mode. It can safely run in non-debug mode and produces the same result, so I removed the restriction. mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: Updated result file. It is a little unclear what the best thing to put in the binlog is, but the present results for this particular test are enough to replicate. Mats will figure out more as he fixes BUG#29020. After BUG#34768 has been fixed, these statements should be marked unsafe and not allowed in statement mode. mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: Updated result file. It is a little unclear what the best thing to put in the binlog is, but the present results for this particular test are enough to replicate. Mats will figure out more as he fixes BUG#29020. After BUG#34768 has been fixed, these statements should be marked unsafe and not allowed in statement mode. --- mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test | 2 +- mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result | 4 +--- mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result | 4 ---- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test index 6ac8a89591a..6879089a1b7 100644 --- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test +++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test @@ -7,7 +7,7 @@ -- source include/have_log_bin.inc -- source include/have_innodb.inc --- source include/have_debug.inc + --disable_warnings drop table if exists t1, t2; diff --git a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result index 63bab2c1169..1c4d52f845a 100644 --- a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result @@ -586,7 +586,7 @@ master-bin.000001 # Query # # use `test`; BEGIN master-bin.000001 # Table_map # # table_id: # (test.t4) master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Query # # use `test`; ROLLBACK +master-bin.000001 # Xid # # COMMIT /* XID */ /* the output must denote there is the query */; select count(*) from t1 /* must be 4 */; count(*) @@ -822,10 +822,8 @@ UPDATE t4,t3 SET t4.a=t3.a + bug27417(1) /* top level non-ta table */; ERROR 23000: Duplicate entry '2' for key 'PRIMARY' show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query # # use `test`; BEGIN master-bin.000001 # Intvar # # INSERT_ID=6 master-bin.000001 # Query # # use `test`; UPDATE t4,t3 SET t4.a=t3.a + bug27417(1) /* top level non-ta table */ -master-bin.000001 # Query # # use `test`; ROLLBACK select count(*) from t1 /* must be 4 */; count(*) 4 diff --git a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result index 39927a8d866..f9a61af1956 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result @@ -549,10 +549,8 @@ UPDATE t4,t3 SET t4.a=t3.a + bug27417(1) /* top level non-ta table */; ERROR 23000: Duplicate entry '2' for key 'PRIMARY' show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query # # use `test`; BEGIN master-bin.000001 # Intvar # # INSERT_ID=6 master-bin.000001 # Query # # use `test`; UPDATE t4,t3 SET t4.a=t3.a + bug27417(1) /* top level non-ta table */ -master-bin.000001 # Query # # use `test`; ROLLBACK /* the output must denote there is the query */; select count(*) from t1 /* must be 4 */; count(*) @@ -788,10 +786,8 @@ UPDATE t4,t3 SET t4.a=t3.a + bug27417(1) /* top level non-ta table */; ERROR 23000: Duplicate entry '2' for key 'PRIMARY' show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query # # use `test`; BEGIN master-bin.000001 # Intvar # # INSERT_ID=6 master-bin.000001 # Query # # use `test`; UPDATE t4,t3 SET t4.a=t3.a + bug27417(1) /* top level non-ta table */ -master-bin.000001 # Query # # use `test`; ROLLBACK select count(*) from t1 /* must be 4 */; count(*) 4