1 files changed, 22 insertions, 5 deletions

diff --git a/mysql-test/t/binlog_multi_engine.test b/mysql-test/t/binlog_multi_engine.test
index e992027b11a..6614b9e5d44 100644
--- a/mysql-test/t/binlog_multi_engine.test
+++ b/mysql-test/t/binlog_multi_engine.test
@@ -6,23 +6,33 @@ CREATE TABLE t1m (m INT, n INT) ENGINE=MYISAM;
 CREATE TABLE t1b (b INT, c INT) ENGINE=BLACKHOLE;
 CREATE TABLE t1n (e INT, f INT) ENGINE=NDB;
 
+RESET MASTER;
+
 SET SESSION BINLOG_FORMAT=STATEMENT;
 
 INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2);
 INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2);
-error ER_BINLOG_LOGGING_IMPOSSIBLE;
-INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2);
 
 UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c;
-error ER_BINLOG_LOGGING_IMPOSSIBLE;
+
+# I cannot use these statements since the rows logged to the NDB table
+# eventually shows up in the binary log. I use them anyway, since once
+# BUG#29222 is fixed, there will be a difference here.
+echo *** Please look in binlog_multi_engine.test if you have a diff here ****;
+START TRANSACTION;
+INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2);
 UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f;
-error ER_BINLOG_LOGGING_IMPOSSIBLE;
 UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c;
+COMMIT;
 
 TRUNCATE t1m;
 TRUNCATE t1b;
 TRUNCATE t1n;
 
+source include/show_binlog_events.inc;
+
+RESET MASTER;
+
 SET SESSION BINLOG_FORMAT=MIXED;
 
 INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2);
@@ -44,6 +54,10 @@ TRUNCATE t1m;
 TRUNCATE t1b;
 TRUNCATE t1n;
 
+source include/show_binlog_events.inc;
+
+RESET MASTER;
+
 SET SESSION BINLOG_FORMAT=ROW;
 
 INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2);
@@ -63,6 +77,9 @@ UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c;
 error ER_BINLOG_LOGGING_IMPOSSIBLE;
 UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c;
 
+source include/show_binlog_events.inc;
+
+RESET MASTER;
+
 DROP TABLE t1m, t1b, t1n;
 
-source include/show_binlog_events.inc;