summaryrefslogtreecommitdiff
path: root/mysql-test/extra
diff options
context:
space:
mode:
authorLuis Soares <luis.soares@oracle.com>2010-12-07 14:26:20 +0000
committerLuis Soares <luis.soares@oracle.com>2010-12-07 14:26:20 +0000
commit3cecccffaf6690536de46734dfd37086e298a916 (patch)
treeef487cfc3cf4ea4085d0d162c2a2923e0d8e4912 /mysql-test/extra
parent078ed281817d370faa3e7f563cf32568528b3591 (diff)
parent6ce0bd8aff9c26fa9eaeee421b1cfaa9ac38e6ae (diff)
downloadmariadb-git-3cecccffaf6690536de46734dfd37086e298a916.tar.gz
BUG#58416
Automerging bzr bundle from bug report into latest mysql-5.1-bugteam.
Diffstat (limited to 'mysql-test/extra')
-rw-r--r--mysql-test/extra/binlog_tests/binlog_failure_mixing_engines.test1
1 files changed, 1 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