summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorLuis Soares <luis.soares@oracle.com>2010-11-27 11:51:07 +0000
committerLuis Soares <luis.soares@oracle.com>2010-11-27 11:51:07 +0000
commit13c9cf26a6a76ba9516b1b4ddb09ddacceb9047a (patch)
tree7c4ec96c1a9339f1fffd1180fdb3d34d7709bd25 /mysql-test
parent534ba9c98ad3bde4368d9a2ac1e0316bd33766e9 (diff)
downloadmariadb-git-13c9cf26a6a76ba9516b1b4ddb09ddacceb9047a.tar.gz
BUG#58416: binlog.binlog_row_failure_mixing_engines fails on
win x86 debug_max The windows MTR run exhibited a different test execution ordering (due to the fact that in these platforms MTR is invoked with --parallel > 1). This uncovered a bug in the aforementioned test case, which is triggered by the following conditions: 1. server is not restarted between two different tests; 2. the test before binlog.binlog_row_failure_mixing_engines issues flush logs; 3. binlog.binlog_row_failure_mixing_engines uses binlog positions to limit the output of show_binlog_events; 4. binlog.binlog_row_failure_mixing_engines does not state which binlog file to use, thence it uses a wrong binlog file with the correct position. There are two possible fixes: 1. make sure that the test start from a clean slate - binlog wise; 2. in addition to the position, also state the binary log file before sourcing show_binlog_events.inc . We go for fix #1, ie, deploy a RESET MASTER before the test is actually started.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/extra/binlog_tests/binlog_failure_mixing_engines.test1
-rw-r--r--mysql-test/suite/binlog/r/binlog_mixed_failure_mixing_engines.result1
-rw-r--r--mysql-test/suite/binlog/r/binlog_row_failure_mixing_engines.result1
3 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/extra/binlog_tests/binlog_failure_mixing_engines.test b/mysql-test/extra/binlog_tests/binlog_failure_mixing_engines.test
index 54f3c538c79..d537e29c1a8 100644
--- a/mysql-test/extra/binlog_tests/binlog_failure_mixing_engines.test
+++ b/mysql-test/extra/binlog_tests/binlog_failure_mixing_engines.test
@@ -60,6 +60,7 @@
# Please, remove this test case after pushing WL#2687.
################################################################################
+RESET MASTER;
--echo ###################################################################################
--echo # CONFIGURATION
diff --git a/mysql-test/suite/binlog/r/binlog_mixed_failure_mixing_engines.result b/mysql-test/suite/binlog/r/binlog_mixed_failure_mixing_engines.result
index dfc08d76a6a..4078103b1f7 100644
--- a/mysql-test/suite/binlog/r/binlog_mixed_failure_mixing_engines.result
+++ b/mysql-test/suite/binlog/r/binlog_mixed_failure_mixing_engines.result
@@ -1,3 +1,4 @@
+RESET MASTER;
###################################################################################
# CONFIGURATION
###################################################################################
diff --git a/mysql-test/suite/binlog/r/binlog_row_failure_mixing_engines.result b/mysql-test/suite/binlog/r/binlog_row_failure_mixing_engines.result
index 45c8640d3e3..2d493397ffd 100644
--- a/mysql-test/suite/binlog/r/binlog_row_failure_mixing_engines.result
+++ b/mysql-test/suite/binlog/r/binlog_row_failure_mixing_engines.result
@@ -1,3 +1,4 @@
+RESET MASTER;
###################################################################################
# CONFIGURATION
###################################################################################