Bug#18946 Test case rpl_ndb_ddl disabled

1. Fixes within the testscripts   (affects rpl_ddl.test and rpl_ndb_ddl.test)
   - slave connection is only an observer (-> AUTOCOMMIT = 0)
     This removes the problem with the hanging test around DROP DATABASE (NDB). The hanging test around DROP DATABASE is a difference to InnoDB/MyISAm behaviour but fare
     away of a clear bug. IMHO this behaviour does not violate the SQL standard and should be therefore simply accepted.   
   - removal of wrong comments
   - CREATE/DROP TEMPORARY TABLE must not cause implicit commit of the current transaction.
     NDB behaves here correct and InnoDB/Falcon wrong.
   - Add a missing connection slave
   - Reenable the test rpl_ndb_ddl.
2. Disable rpl_ddl.test because of Bug#26418.
3. Reenable rpl_ndb_ddl.test
4. Improvements (affect rpl_ddl.test and rpl_ndb_ddl.test)
   - Better + extended comments which should prevent that somebody accidently destroys the logics of the test
   - Replace SELECT's printing comments by "--echo"  (decreases the number of auxiliary SQL commands)
   - Remove the need for include/rpl_stmt_seq2.inc   (was mostly redundant to rpl_stmt_seq.inc)
   - Remove extra/rpl_tests/rpl_ndb_ddl.test         (corrected extra/rpl_tests/rpl_ddl.test is sufficient)  
   - Shift assignment of values to $show_binlog, $manipulate (variables useful for debugging) into the toplevel scripts
   - The temporary tables get now their storage engine from the variable $temp_engine_type. (more deterministic testing conditions)
   - Add additional protocol line if the connection is switched (was partially missing)
   - Add two DML commands for comparison purposes 


BitKeeper/deleted/.del-rpl_ndb_ddl.test:
  Delete: mysql-test/extra/rpl_tests/rpl_ndb_ddl.test
BitKeeper/deleted/.del-rpl_stmt_seq2.inc:
  Delete: mysql-test/include/rpl_stmt_seq2.inc
mysql-test/extra/rpl_tests/rpl_ddl.test:
  Improvements + Fixes
mysql-test/include/rpl_stmt_seq.inc:
  Improvements
mysql-test/r/rpl_ddl.result:
  Updated expected results
mysql-test/r/rpl_ndb_ddl.result:
  Updated expected results
mysql-test/t/disabled.def:
  Reenable rpl_ndb_ddl because of bug fix.
  Disable rpl_ddl because of Bug#26418.
mysql-test/t/rpl_ddl.test:
  Improvements
mysql-test/t/rpl_ndb_ddl.test:
  Improvements

1 files changed, 181 insertions, 253 deletions

diff --git a/mysql-test/r/rpl_ndb_ddl.result b/mysql-test/r/rpl_ndb_ddl.result
index f5d8073be94..aeaca1e7de0 100644
--- a/mysql-test/r/rpl_ndb_ddl.result
+++ b/mysql-test/r/rpl_ndb_ddl.result
@@ -4,45 +4,47 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+
+-------- switch to master -------
 SET AUTOCOMMIT = 1;
 DROP DATABASE IF EXISTS mysqltest1;
 DROP DATABASE IF EXISTS mysqltest2;
 DROP DATABASE IF EXISTS mysqltest3;
 CREATE DATABASE mysqltest1;
 CREATE DATABASE mysqltest2;
-CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE="NDB";
+CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE=NDB;
 INSERT INTO mysqltest1.t1 SET f1= 0;
-CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE="NDB";
-CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE="NDB";
-CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE="NDB";
-CREATE TABLE mysqltest1.t5 (f1 BIGINT) ENGINE="NDB";
-CREATE TABLE mysqltest1.t6 (f1 BIGINT) ENGINE="NDB";
+CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE=NDB;
+CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE=NDB;
+CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE=NDB;
+CREATE TABLE mysqltest1.t5 (f1 BIGINT) ENGINE=NDB;
+CREATE TABLE mysqltest1.t6 (f1 BIGINT) ENGINE=NDB;
 CREATE INDEX my_idx6 ON mysqltest1.t6(f1);
-CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE="NDB";
+CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE=NDB;
 INSERT INTO mysqltest1.t7 SET f1= 0;
-CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE="NDB";
-CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE="NDB";
-CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE="NDB";
-CREATE TABLE mysqltest1.t11 (f1 BIGINT) ENGINE="NDB";
-CREATE TABLE mysqltest1.t12 (f1 BIGINT) ENGINE="NDB";
-CREATE TABLE mysqltest1.t13 (f1 BIGINT) ENGINE="NDB";
-CREATE TABLE mysqltest1.t14 (f1 BIGINT) ENGINE="NDB";
-CREATE TABLE mysqltest1.t15 (f1 BIGINT) ENGINE="NDB";
-CREATE TABLE mysqltest1.t16 (f1 BIGINT) ENGINE="NDB";
-CREATE TABLE mysqltest1.t17 (f1 BIGINT) ENGINE="NDB";
-CREATE TABLE mysqltest1.t18 (f1 BIGINT) ENGINE="NDB";
-CREATE TABLE mysqltest1.t19 (f1 BIGINT) ENGINE="NDB";
-CREATE TEMPORARY TABLE mysqltest1.t23 (f1 BIGINT);
+CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE=NDB;
+CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE=NDB;
+CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE=NDB;
+CREATE TABLE mysqltest1.t11 (f1 BIGINT) ENGINE=NDB;
+CREATE TABLE mysqltest1.t12 (f1 BIGINT) ENGINE=NDB;
+CREATE TABLE mysqltest1.t13 (f1 BIGINT) ENGINE=NDB;
+CREATE TABLE mysqltest1.t14 (f1 BIGINT) ENGINE=NDB;
+CREATE TABLE mysqltest1.t15 (f1 BIGINT) ENGINE=NDB;
+CREATE TABLE mysqltest1.t16 (f1 BIGINT) ENGINE=NDB;
+CREATE TABLE mysqltest1.t17 (f1 BIGINT) ENGINE=NDB;
+CREATE TABLE mysqltest1.t18 (f1 BIGINT) ENGINE=NDB;
+CREATE TABLE mysqltest1.t19 (f1 BIGINT) ENGINE=NDB;
+CREATE TEMPORARY TABLE mysqltest1.t23 (f1 BIGINT) ENGINE=MEMORY;
 SET AUTOCOMMIT = 0;
 use mysqltest1;
 
 -------- switch to slave --------
-SET AUTOCOMMIT = 0;
+SET AUTOCOMMIT = 1;
 use mysqltest1;
 
 -------- switch to master -------
 
-######## COMMIT  ########
+######## SELECT 1 ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 0 + 1;
@@ -56,7 +58,9 @@ MAX(f1)
 0
 
 -------- switch to master -------
-COMMIT;
+SELECT 1;
+1
+1
 SELECT MAX(f1) FROM t1;
 MAX(f1)
 1
@@ -64,32 +68,110 @@ MAX(f1)
 -------- switch to slave --------
 SELECT MAX(f1) FROM t1;
 MAX(f1)
-1
+0
 
 -------- switch to master -------
 ROLLBACK;
 SELECT MAX(f1) FROM t1;
 MAX(f1)
+0
+
+TEST-INFO: MASTER: The INSERT is not committed (Succeeded)
+
+-------- switch to slave --------
+SELECT MAX(f1) FROM t1;
+MAX(f1)
+0
+
+TEST-INFO: SLAVE:  The INSERT is not committed (Succeeded)
+
+-------- switch to master -------
+
+######## SELECT COUNT(*) FROM t1 ########
+
+-------- switch to master -------
+INSERT INTO t1 SET f1= 0 + 1;
+SELECT MAX(f1) FROM t1;
+MAX(f1)
 1
 
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
+-------- switch to slave --------
+SELECT MAX(f1) FROM t1;
+MAX(f1)
+0
+
+-------- switch to master -------
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+2
+SELECT MAX(f1) FROM t1;
+MAX(f1)
+1
 
 -------- switch to slave --------
 SELECT MAX(f1) FROM t1;
 MAX(f1)
+0
+
+-------- switch to master -------
+ROLLBACK;
+SELECT MAX(f1) FROM t1;
+MAX(f1)
+0
+
+TEST-INFO: MASTER: The INSERT is not committed (Succeeded)
+
+-------- switch to slave --------
+SELECT MAX(f1) FROM t1;
+MAX(f1)
+0
+
+TEST-INFO: SLAVE:  The INSERT is not committed (Succeeded)
+
+-------- switch to master -------
+
+######## COMMIT ########
+
+-------- switch to master -------
+INSERT INTO t1 SET f1= 0 + 1;
+SELECT MAX(f1) FROM t1;
+MAX(f1)
 1
 
-TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
+-------- switch to slave --------
+SELECT MAX(f1) FROM t1;
+MAX(f1)
+0
 
 -------- switch to master -------
-flush logs;
+COMMIT;
+SELECT MAX(f1) FROM t1;
+MAX(f1)
+1
 
 -------- switch to slave --------
-flush logs;
+SELECT MAX(f1) FROM t1;
+MAX(f1)
+1
 
 -------- switch to master -------
+ROLLBACK;
+SELECT MAX(f1) FROM t1;
+MAX(f1)
+1
 
-######## ROLLBACK  ########
+TEST-INFO: MASTER: The INSERT is committed (Succeeded)
+
+-------- switch to slave --------
+SELECT MAX(f1) FROM t1;
+MAX(f1)
+1
+
+TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
+
+-------- switch to master -------
+
+######## ROLLBACK ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 1 + 1;
@@ -129,14 +211,8 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is not committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 
-######## SET AUTOCOMMIT=1  ########
+######## SET AUTOCOMMIT=1 ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 1 + 1;
@@ -176,15 +252,9 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 SET AUTOCOMMIT=0;
 
-######## START TRANSACTION  ########
+######## START TRANSACTION ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 2 + 1;
@@ -224,14 +294,8 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 
-######## BEGIN  ########
+######## BEGIN ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 3 + 1;
@@ -271,14 +335,8 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
 
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
-
-######## DROP TABLE mysqltest1.t2  ########
+######## DROP TABLE mysqltest1.t2 ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 4 + 1;
@@ -318,12 +376,6 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 SHOW TABLES LIKE 't2';
 Tables_in_mysqltest1 (t2)
 
@@ -333,7 +385,7 @@ Tables_in_mysqltest1 (t2)
 
 -------- switch to master -------
 
-######## DROP TEMPORARY TABLE mysqltest1.t23  ########
+######## DROP TEMPORARY TABLE mysqltest1.t23 ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 5 + 1;
@@ -373,12 +425,6 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is not committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 SHOW TABLES LIKE 't23';
 Tables_in_mysqltest1 (t23)
 
@@ -388,7 +434,7 @@ Tables_in_mysqltest1 (t23)
 
 -------- switch to master -------
 
-######## RENAME TABLE mysqltest1.t3 to mysqltest1.t20  ########
+######## RENAME TABLE mysqltest1.t3 to mysqltest1.t20 ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 5 + 1;
@@ -428,12 +474,6 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 SHOW TABLES LIKE 't20';
 Tables_in_mysqltest1 (t20)
 t20
@@ -445,7 +485,7 @@ t20
 
 -------- switch to master -------
 
-######## ALTER TABLE mysqltest1.t4 ADD column f2 BIGINT  ########
+######## ALTER TABLE mysqltest1.t4 ADD column f2 BIGINT ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 6 + 1;
@@ -485,12 +525,6 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 describe mysqltest1.t4;
 Field	Type	Null	Key	Default	Extra
 f1	bigint(20)	YES		NULL	
@@ -504,7 +538,7 @@ f2	bigint(20)	YES		NULL
 
 -------- switch to master -------
 
-######## CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "NDB"  ########
+######## CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= NDB ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 7 + 1;
@@ -518,7 +552,7 @@ MAX(f1)
 7
 
 -------- switch to master -------
-CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "NDB";
+CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= NDB;
 SELECT MAX(f1) FROM t1;
 MAX(f1)
 8
@@ -544,14 +578,8 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 
-######## CREATE TEMPORARY TABLE mysqltest1.t22 (f1 BIGINT)  ########
+######## CREATE TEMPORARY TABLE mysqltest1.t22 (f1 BIGINT) ENGINE=MEMORY ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 8 + 1;
@@ -565,7 +593,7 @@ MAX(f1)
 8
 
 -------- switch to master -------
-CREATE TEMPORARY TABLE mysqltest1.t22 (f1 BIGINT);
+CREATE TEMPORARY TABLE mysqltest1.t22 (f1 BIGINT) ENGINE=MEMORY;
 SELECT MAX(f1) FROM t1;
 MAX(f1)
 9
@@ -591,14 +619,8 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is not committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 
-######## TRUNCATE TABLE mysqltest1.t7  ########
+######## TRUNCATE TABLE mysqltest1.t7 ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 8 + 1;
@@ -638,20 +660,16 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 SELECT * FROM mysqltest1.t7;
 f1
+
 -------- switch to slave --------
 SELECT * FROM mysqltest1.t7;
 f1
+
 -------- switch to master -------
 
-######## LOCK TABLES mysqltest1.t1 WRITE, mysqltest1.t8 READ  ########
+######## LOCK TABLES mysqltest1.t1 WRITE, mysqltest1.t8 READ ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 9 + 1;
@@ -691,15 +709,9 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 UNLOCK TABLES;
 
-######## UNLOCK TABLES  ########
+######## UNLOCK TABLES ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 10 + 1;
@@ -739,15 +751,9 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is not committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 LOCK TABLES mysqltest1.t1 READ;
 
-######## UNLOCK TABLES  ########
+######## UNLOCK TABLES ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 10 + 1;
@@ -788,15 +794,9 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is not committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 LOCK TABLES mysqltest1.t1 WRITE, mysqltest1.t8 READ;
 
-######## UNLOCK TABLES  ########
+######## UNLOCK TABLES ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 10 + 1;
@@ -836,14 +836,8 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
 
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
-
-######## DROP INDEX my_idx6 ON mysqltest1.t6  ########
+######## DROP INDEX my_idx6 ON mysqltest1.t6 ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 11 + 1;
@@ -883,12 +877,6 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 SHOW INDEX FROM mysqltest1.t6;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 
@@ -898,7 +886,7 @@ Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_par
 
 -------- switch to master -------
 
-######## CREATE INDEX my_idx5 ON mysqltest1.t5(f1)  ########
+######## CREATE INDEX my_idx5 ON mysqltest1.t5(f1) ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 12 + 1;
@@ -938,12 +926,6 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 SHOW INDEX FROM mysqltest1.t5;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t5	1	my_idx5	1	f1	A	0	NULL	NULL	YES	BTREE	
@@ -955,7 +937,7 @@ t5	1	my_idx5	1	f1	A	0	NULL	NULL	YES	BTREE
 
 -------- switch to master -------
 
-######## DROP DATABASE mysqltest2  ########
+######## DROP DATABASE mysqltest2 ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 13 + 1;
@@ -995,12 +977,6 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 SHOW DATABASES LIKE "mysqltest2";
 Database (mysqltest2)
 
@@ -1010,7 +986,7 @@ Database (mysqltest2)
 
 -------- switch to master -------
 
-######## CREATE DATABASE mysqltest3  ########
+######## CREATE DATABASE mysqltest3 ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 14 + 1;
@@ -1050,12 +1026,6 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 SHOW DATABASES LIKE "mysqltest3";
 Database (mysqltest3)
 mysqltest3
@@ -1067,7 +1037,7 @@ mysqltest3
 
 -------- switch to master -------
 
-######## CREATE PROCEDURE p1() READS SQL DATA SELECT "this is p1"  ########
+######## CREATE PROCEDURE p1() READS SQL DATA SELECT "this is p1" ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 15 + 1;
@@ -1107,12 +1077,6 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 SHOW PROCEDURE STATUS LIKE 'p1';
 Db	mysqltest1
 Name	p1
@@ -1122,7 +1086,8 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-	-------- switch to slave -------
+
+-------- switch to slave --------
 SHOW PROCEDURE STATUS LIKE 'p1';
 Db	mysqltest1
 Name	p1
@@ -1133,7 +1098,9 @@ Created	#
 Security_type	DEFINER
 Comment	
 
-######## ALTER PROCEDURE p1 COMMENT "I have been altered"  ########
+-------- switch to master -------
+
+######## ALTER PROCEDURE p1 COMMENT "I have been altered" ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 16 + 1;
@@ -1173,12 +1140,6 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 SHOW PROCEDURE STATUS LIKE 'p1';
 Db	mysqltest1
 Name	p1
@@ -1188,7 +1149,8 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	I have been altered
-	-------- switch to slave -------
+
+-------- switch to slave --------
 SHOW PROCEDURE STATUS LIKE 'p1';
 Db	mysqltest1
 Name	p1
@@ -1199,7 +1161,9 @@ Created	#
 Security_type	DEFINER
 Comment	I have been altered
 
-######## DROP PROCEDURE p1  ########
+-------- switch to master -------
+
+######## DROP PROCEDURE p1 ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 17 + 1;
@@ -1239,17 +1203,14 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
+SHOW PROCEDURE STATUS LIKE 'p1';
 
 -------- switch to slave --------
-flush logs;
+SHOW PROCEDURE STATUS LIKE 'p1';
 
 -------- switch to master -------
-SHOW PROCEDURE STATUS LIKE 'p1';
-	-------- switch to slave -------
-SHOW PROCEDURE STATUS LIKE 'p1';
 
-######## CREATE OR REPLACE VIEW v1 as select * from t1  ########
+######## CREATE OR REPLACE VIEW v1 as select * from t1 ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 18 + 1;
@@ -1289,22 +1250,18 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`
 
--------- switch to slave -------
+-------- switch to slave --------
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`
 
-######## ALTER VIEW v1 AS select f1 from t1  ########
+-------- switch to master -------
+
+######## ALTER VIEW v1 AS select f1 from t1 ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 19 + 1;
@@ -1344,22 +1301,18 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`
 
--------- switch to slave -------
+-------- switch to slave --------
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`
 
-######## DROP VIEW IF EXISTS v1  ########
+-------- switch to master -------
+
+######## DROP VIEW IF EXISTS v1 ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 20 + 1;
@@ -1399,20 +1352,16 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 SHOW CREATE VIEW v1;
 ERROR 42S02: Table 'mysqltest1.v1' doesn't exist
 
--------- switch to slave -------
+-------- switch to slave --------
 SHOW CREATE VIEW v1;
 ERROR 42S02: Table 'mysqltest1.v1' doesn't exist
 
-######## CREATE TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW SET @a:=1  ########
+-------- switch to master -------
+
+######## CREATE TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW SET @a:=1 ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 21 + 1;
@@ -1452,22 +1401,18 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 SHOW TRIGGERS;
 Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
 trg1	INSERT	t1	SET @a:=1	BEFORE	NULL		root@localhost
 
--------- switch to slave -------
+-------- switch to slave --------
 SHOW TRIGGERS;
 Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
 trg1	INSERT	t1	SET @a:=1	BEFORE	NULL		root@localhost
 
-######## DROP TRIGGER trg1  ########
+-------- switch to master -------
+
+######## DROP TRIGGER trg1 ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 22 + 1;
@@ -1507,20 +1452,16 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 SHOW TRIGGERS;
 Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
 
--------- switch to slave -------
+-------- switch to slave --------
 SHOW TRIGGERS;
 Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
 
-######## CREATE USER user1@localhost  ########
+-------- switch to master -------
+
+######## CREATE USER user1@localhost ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 23 + 1;
@@ -1560,22 +1501,18 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 SELECT user FROM mysql.user WHERE user = 'user1';
 user
 user1
 
--------- switch to slave -------
+-------- switch to slave --------
 SELECT user FROM mysql.user WHERE user = 'user1';
 user
 user1
 
-######## RENAME USER user1@localhost TO rename1@localhost  ########
+-------- switch to master -------
+
+######## RENAME USER user1@localhost TO rename1@localhost ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 24 + 1;
@@ -1615,22 +1552,18 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 SELECT user FROM mysql.user WHERE user = 'rename1';
 user
 rename1
 
--------- switch to slave -------
+-------- switch to slave --------
 SELECT user FROM mysql.user WHERE user = 'rename1';
 user
 rename1
 
-######## DROP USER rename1@localhost  ########
+-------- switch to master -------
+
+######## DROP USER rename1@localhost ########
 
 -------- switch to master -------
 INSERT INTO t1 SET f1= 25 + 1;
@@ -1670,19 +1603,14 @@ MAX(f1)
 TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
 
 -------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
 SELECT user FROM mysql.user WHERE user = 'rename1';
 user
 
--------- switch to slave -------
+-------- switch to slave --------
 SELECT user FROM mysql.user WHERE user = 'rename1';
 user
-DROP DATABASE IF EXISTS mysqltest1;
-DROP DATABASE IF EXISTS mysqltest2;
-DROP DATABASE IF EXISTS mysqltest3;
-ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
+use test;
+
+-------- switch to master -------
+DROP DATABASE mysqltest1;
+DROP DATABASE mysqltest3;