Post-fix for WL#2687 WL#5072 BUG#40278 BUG#47175

Create a set of test cases to see if some DDL statements implicitly commit
a transaction on the NDB and are written directly to the binary log without
going through either the Statement- or Transactional-Cache.

mysql-test/extra/rpl_tests/rpl_mixing_engines.inc

@@ -516,10 +516,12 @@ while (`SELECT HEX(@commands) != HEX('')`)
   }
   if (`SELECT HEX(@command) = HEX('C')`)
   {
+    --error 0, ER_GET_ERRMSG
     eval COMMIT;
   }
   if (`SELECT HEX(@command) = HEX('R')`)
   {
+    --error 0, ER_GET_ERRMSG
     eval ROLLBACK;
   }
   if (`SELECT HEX(@command) = HEX('S1')`)

mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result

@@ -9,6 +9,7 @@ start slave;
 #########################################################################
 CREATE TABLE tt_1 (ddl_case INT, PRIMARY KEY(ddl_case)) ENGINE = Innodb;
 CREATE TABLE tt_2 (ddl_case INT, PRIMARY KEY(ddl_case)) ENGINE = Innodb;
+CREATE TABLE nt_1 (ddl_case INT, PRIMARY KEY(ddl_case)) ENGINE = MyIsam;
 INSERT INTO tt_1(ddl_case) VALUES(0);
 INSERT INTO tt_2(ddl_case) VALUES(0);
 #########################################################################
@@ -19,8 +20,7 @@ SET AUTOCOMMIT= 0;
 INSERT INTO tt_1(ddl_case) VALUES (41);
 LOAD INDEX INTO CACHE nt_1 IGNORE LEAVES;
 Table	Op	Msg_type	Msg_text
-test.nt_1	preload_keys	Error	Table 'test.nt_1' doesn't exist
-test.nt_1	preload_keys	status	Operation failed
+test.nt_1	preload_keys	status	OK
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -31,12 +31,10 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 INSERT INTO tt_1(ddl_case) VALUES (40);
-LOAD INDEX INTO CACHE t1, t2 IGNORE LEAVES;
+LOAD INDEX INTO CACHE tt_1, tt_2 IGNORE LEAVES;
 Table	Op	Msg_type	Msg_text
-test.t1	preload_keys	Error	Table 'test.t1' doesn't exist
-test.t1	preload_keys	status	Operation failed
-test.t2	preload_keys	Error	Table 'test.t2' doesn't exist
-test.t2	preload_keys	status	Operation failed
+test.tt_1	preload_keys	note	The storage engine for the table doesn't support preload_keys
+test.tt_2	preload_keys	note	The storage engine for the table doesn't support preload_keys
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -49,8 +47,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 INSERT INTO tt_1(ddl_case) VALUES (39);
 ANALYZE TABLE nt_1;
 Table	Op	Msg_type	Msg_text
-test.nt_1	analyze	Error	Table 'test.nt_1' doesn't exist
-test.nt_1	analyze	status	Operation failed
+test.nt_1	analyze	status	Table is already up to date
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -64,8 +61,7 @@ master-bin.000001	#	Query	#	#	use `test`; ANALYZE TABLE nt_1
 INSERT INTO tt_1(ddl_case) VALUES (38);
 CHECK TABLE nt_1;
 Table	Op	Msg_type	Msg_text
-test.nt_1	check	Error	Table 'test.nt_1' doesn't exist
-test.nt_1	check	status	Operation failed
+test.nt_1	check	status	OK
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -78,8 +74,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 INSERT INTO tt_1(ddl_case) VALUES (37);
 OPTIMIZE TABLE nt_1;
 Table	Op	Msg_type	Msg_text
-test.nt_1	optimize	Error	Table 'test.nt_1' doesn't exist
-test.nt_1	optimize	status	Operation failed
+test.nt_1	optimize	status	Table is already up to date
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -93,8 +88,7 @@ master-bin.000001	#	Query	#	#	use `test`; OPTIMIZE TABLE nt_1
 INSERT INTO tt_1(ddl_case) VALUES (36);
 REPAIR TABLE nt_1;
 Table	Op	Msg_type	Msg_text
-test.nt_1	repair	Error	Table 'test.nt_1' doesn't exist
-test.nt_1	repair	status	Operation failed
+test.nt_1	repair	status	OK
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -536,3 +530,4 @@ Comparing tables master:test.tt_1 and slave:test.tt_1
 ###################################################################################
 DROP TABLE tt_1;
 DROP TABLE tt_2;
+DROP TABLE nt_1;

mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result

@@ -9,6 +9,7 @@ start slave;
 #########################################################################
 CREATE TABLE tt_1 (ddl_case INT, PRIMARY KEY(ddl_case)) ENGINE = Innodb;
 CREATE TABLE tt_2 (ddl_case INT, PRIMARY KEY(ddl_case)) ENGINE = Innodb;
+CREATE TABLE nt_1 (ddl_case INT, PRIMARY KEY(ddl_case)) ENGINE = MyIsam;
 INSERT INTO tt_1(ddl_case) VALUES(0);
 INSERT INTO tt_2(ddl_case) VALUES(0);
 #########################################################################
@@ -19,8 +20,7 @@ SET AUTOCOMMIT= 0;
 INSERT INTO tt_1(ddl_case) VALUES (41);
 LOAD INDEX INTO CACHE nt_1 IGNORE LEAVES;
 Table	Op	Msg_type	Msg_text
-test.nt_1	preload_keys	Error	Table 'test.nt_1' doesn't exist
-test.nt_1	preload_keys	status	Operation failed
+test.nt_1	preload_keys	status	OK
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -32,12 +32,10 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 INSERT INTO tt_1(ddl_case) VALUES (40);
-LOAD INDEX INTO CACHE t1, t2 IGNORE LEAVES;
+LOAD INDEX INTO CACHE tt_1, tt_2 IGNORE LEAVES;
 Table	Op	Msg_type	Msg_text
-test.t1	preload_keys	Error	Table 'test.t1' doesn't exist
-test.t1	preload_keys	status	Operation failed
-test.t2	preload_keys	Error	Table 'test.t2' doesn't exist
-test.t2	preload_keys	status	Operation failed
+test.tt_1	preload_keys	note	The storage engine for the table doesn't support preload_keys
+test.tt_2	preload_keys	note	The storage engine for the table doesn't support preload_keys
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -51,8 +49,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 INSERT INTO tt_1(ddl_case) VALUES (39);
 ANALYZE TABLE nt_1;
 Table	Op	Msg_type	Msg_text
-test.nt_1	analyze	Error	Table 'test.nt_1' doesn't exist
-test.nt_1	analyze	status	Operation failed
+test.nt_1	analyze	status	Table is already up to date
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -67,8 +64,7 @@ master-bin.000001	#	Query	#	#	use `test`; ANALYZE TABLE nt_1
 INSERT INTO tt_1(ddl_case) VALUES (38);
 CHECK TABLE nt_1;
 Table	Op	Msg_type	Msg_text
-test.nt_1	check	Error	Table 'test.nt_1' doesn't exist
-test.nt_1	check	status	Operation failed
+test.nt_1	check	status	OK
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -82,8 +78,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 INSERT INTO tt_1(ddl_case) VALUES (37);
 OPTIMIZE TABLE nt_1;
 Table	Op	Msg_type	Msg_text
-test.nt_1	optimize	Error	Table 'test.nt_1' doesn't exist
-test.nt_1	optimize	status	Operation failed
+test.nt_1	optimize	status	Table is already up to date
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -98,8 +93,7 @@ master-bin.000001	#	Query	#	#	use `test`; OPTIMIZE TABLE nt_1
 INSERT INTO tt_1(ddl_case) VALUES (36);
 REPAIR TABLE nt_1;
 Table	Op	Msg_type	Msg_text
-test.nt_1	repair	Error	Table 'test.nt_1' doesn't exist
-test.nt_1	repair	status	Operation failed
+test.nt_1	repair	status	OK
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -577,3 +571,4 @@ Comparing tables master:test.tt_1 and slave:test.tt_1
 ###################################################################################
 DROP TABLE tt_1;
 DROP TABLE tt_2;
+DROP TABLE nt_1;

mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result

@@ -9,6 +9,7 @@ start slave;
 #########################################################################
 CREATE TABLE tt_1 (ddl_case INT, PRIMARY KEY(ddl_case)) ENGINE = Innodb;
 CREATE TABLE tt_2 (ddl_case INT, PRIMARY KEY(ddl_case)) ENGINE = Innodb;
+CREATE TABLE nt_1 (ddl_case INT, PRIMARY KEY(ddl_case)) ENGINE = MyIsam;
 INSERT INTO tt_1(ddl_case) VALUES(0);
 INSERT INTO tt_2(ddl_case) VALUES(0);
 #########################################################################
@@ -19,8 +20,7 @@ SET AUTOCOMMIT= 0;
 INSERT INTO tt_1(ddl_case) VALUES (41);
 LOAD INDEX INTO CACHE nt_1 IGNORE LEAVES;
 Table	Op	Msg_type	Msg_text
-test.nt_1	preload_keys	Error	Table 'test.nt_1' doesn't exist
-test.nt_1	preload_keys	status	Operation failed
+test.nt_1	preload_keys	status	OK
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -31,12 +31,10 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 INSERT INTO tt_1(ddl_case) VALUES (40);
-LOAD INDEX INTO CACHE t1, t2 IGNORE LEAVES;
+LOAD INDEX INTO CACHE tt_1, tt_2 IGNORE LEAVES;
 Table	Op	Msg_type	Msg_text
-test.t1	preload_keys	Error	Table 'test.t1' doesn't exist
-test.t1	preload_keys	status	Operation failed
-test.t2	preload_keys	Error	Table 'test.t2' doesn't exist
-test.t2	preload_keys	status	Operation failed
+test.tt_1	preload_keys	note	The storage engine for the table doesn't support preload_keys
+test.tt_2	preload_keys	note	The storage engine for the table doesn't support preload_keys
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -49,8 +47,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 INSERT INTO tt_1(ddl_case) VALUES (39);
 ANALYZE TABLE nt_1;
 Table	Op	Msg_type	Msg_text
-test.nt_1	analyze	Error	Table 'test.nt_1' doesn't exist
-test.nt_1	analyze	status	Operation failed
+test.nt_1	analyze	status	Table is already up to date
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -64,8 +61,7 @@ master-bin.000001	#	Query	#	#	use `test`; ANALYZE TABLE nt_1
 INSERT INTO tt_1(ddl_case) VALUES (38);
 CHECK TABLE nt_1;
 Table	Op	Msg_type	Msg_text
-test.nt_1	check	Error	Table 'test.nt_1' doesn't exist
-test.nt_1	check	status	Operation failed
+test.nt_1	check	status	OK
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -78,8 +74,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 INSERT INTO tt_1(ddl_case) VALUES (37);
 OPTIMIZE TABLE nt_1;
 Table	Op	Msg_type	Msg_text
-test.nt_1	optimize	Error	Table 'test.nt_1' doesn't exist
-test.nt_1	optimize	status	Operation failed
+test.nt_1	optimize	status	Table is already up to date
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -93,8 +88,7 @@ master-bin.000001	#	Query	#	#	use `test`; OPTIMIZE TABLE nt_1
 INSERT INTO tt_1(ddl_case) VALUES (36);
 REPAIR TABLE nt_1;
 Table	Op	Msg_type	Msg_text
-test.nt_1	repair	Error	Table 'test.nt_1' doesn't exist
-test.nt_1	repair	status	Operation failed
+test.nt_1	repair	status	OK
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -535,3 +529,4 @@ Comparing tables master:test.tt_1 and slave:test.tt_1
 ###################################################################################
 DROP TABLE tt_1;
 DROP TABLE tt_2;
+DROP TABLE nt_1;

mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test

@@ -5,4 +5,5 @@
 --source include/master-slave.inc
 --source include/have_innodb.inc
 
+--let $engine=Innodb
 --source extra/rpl_tests/rpl_implicit_commit_binlog.test

mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test

@@ -5,4 +5,5 @@
 --source include/master-slave.inc
 --source include/have_innodb.inc
 
+--let $engine=Innodb
 --source extra/rpl_tests/rpl_implicit_commit_binlog.test

mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test

@@ -5,4 +5,5 @@
 --source include/master-slave.inc
 --source include/have_innodb.inc
 
+--let $engine=Innodb
 --source extra/rpl_tests/rpl_implicit_commit_binlog.test

mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_implicit_commit_binlog.test

+################################################################################
+# Check file extra/rpl_tests/rpl_implicit_commit_binlog.test
+################################################################################
+--source include/have_binlog_format_mixed.inc
+--source include/have_ndb.inc
+--source include/ndb_master-slave.inc
+
+--let $engine=NDB
+--source extra/rpl_tests/rpl_implicit_commit_binlog.test

mysql-test/suite/rpl_ndb/t/rpl_ndb_row_implicit_commit_binlog.test

+################################################################################
+# Check file extra/rpl_tests/rpl_implicit_commit_binlog.test
+################################################################################
+--source include/have_binlog_format_row.inc
+--source include/have_ndb.inc
+--source include/ndb_master-slave.inc
+
+--let $engine=NDB
+--source extra/rpl_tests/rpl_implicit_commit_binlog.test