Updated tests from Lars Review

14 files changed, 86 insertions, 2131 deletions

diff --git a/mysql-test/r/rpl_row_ddl.result b/mysql-test/r/rpl_ddl.result
index c77f4e2b38f..c77f4e2b38f 100644
--- a/mysql-test/r/rpl_row_ddl.result
+++ b/mysql-test/r/rpl_ddl.result
diff --git a/mysql-test/r/rpl_err_ignoredtable.result b/mysql-test/r/rpl_err_ignoredtable.result
new file mode 100644
index 00000000000..84072be7d44
--- /dev/null
+++ b/mysql-test/r/rpl_err_ignoredtable.result
@@ -0,0 +1,42 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+create table t1 (a int primary key);
+create table t4 (a int primary key);
+insert into t1 values (1),(1);
+ERROR 23000: Duplicate entry '1' for key 1
+insert into t4 values (1),(2);
+show tables like 't1';
+Tables_in_test (t1)
+show tables like 't4';
+Tables_in_test (t4)
+t4
+SELECT * FROM test.t4;
+a
+1
+2
+drop table t1;
+select get_lock('crash_lock%20C', 10);
+get_lock('crash_lock%20C', 10)
+1
+create table t2 (a int primary key);
+insert into t2 values(1);
+create table t3 (id int);
+insert into t3 values(connection_id());
+ update t2 set a = a + 1 + get_lock('crash_lock%20C', 10);
+select (@id := id) - id from t3;
+(@id := id) - id
+0
+kill @id;
+drop table t2,t3;
+insert into t4 values (3),(4);
+SELECT * FROM test.t4;
+a
+1
+2
+3
+4
+DROP TABLE test.t4;
diff --git a/mysql-test/r/rpl_loaddata_m.result b/mysql-test/r/rpl_loaddata_m.result
new file mode 100644
index 00000000000..1d263a41e1b
--- /dev/null
+++ b/mysql-test/r/rpl_loaddata_m.result
@@ -0,0 +1,38 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+drop database if exists mysqltest;
+USE test;
+CREATE TABLE t1(a INT, b INT, UNIQUE(b));
+LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE test.t1;
+SELECT COUNT(*) FROM test.t1;
+COUNT(*)
+2
+CREATE DATABASE mysqltest;
+USE mysqltest;
+CREATE TABLE t1(a INT, b INT, UNIQUE(b));
+LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE mysqltest.t1;
+SELECT COUNT(*) FROM mysqltest.t1;
+COUNT(*)
+2
+SHOW DATABASES;
+Database
+information_schema
+mysql
+mysqltest
+test
+USE test;
+SHOW TABLES;
+Tables_in_test
+USE mysqltest;
+SHOW TABLES;
+Tables_in_mysqltest
+t1
+SELECT COUNT(*) FROM mysqltest.t1;
+COUNT(*)
+2
+DROP DATABASE mysqltest;
+DROP TABLE test.t1;
diff --git a/mysql-test/r/rpl_row_rewrt_db.result b/mysql-test/r/rpl_rewrt_db.result
index 6c72e982e3e..6c72e982e3e 100644
--- a/mysql-test/r/rpl_row_rewrt_db.result
+++ b/mysql-test/r/rpl_rewrt_db.result
diff --git a/mysql-test/r/rpl_stm_ddl.result b/mysql-test/r/rpl_stm_ddl.result
deleted file mode 100644
index 91163f1fe29..00000000000
--- a/mysql-test/r/rpl_stm_ddl.result
+++ /dev/null
@@ -1,1693 +0,0 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
-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="InnoDB";
-INSERT INTO mysqltest1.t1 SET f1= 0;
-CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE="InnoDB";
-CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE="InnoDB";
-CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE="InnoDB";
-CREATE TABLE mysqltest1.t5 (f1 BIGINT) ENGINE="InnoDB";
-CREATE TABLE mysqltest1.t6 (f1 BIGINT) ENGINE="InnoDB";
-CREATE INDEX my_idx6 ON mysqltest1.t6(f1);
-CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE="InnoDB";
-INSERT INTO mysqltest1.t7 SET f1= 0;
-CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE="InnoDB";
-CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE="InnoDB";
-CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE="InnoDB";
-CREATE TABLE mysqltest1.t11 (f1 BIGINT) ENGINE="InnoDB";
-CREATE TABLE mysqltest1.t12 (f1 BIGINT) ENGINE="InnoDB";
-CREATE TABLE mysqltest1.t13 (f1 BIGINT) ENGINE="InnoDB";
-CREATE TABLE mysqltest1.t14 (f1 BIGINT) ENGINE="InnoDB";
-CREATE TABLE mysqltest1.t15 (f1 BIGINT) ENGINE="InnoDB";
-CREATE TABLE mysqltest1.t16 (f1 BIGINT) ENGINE="InnoDB";
-CREATE TABLE mysqltest1.t17 (f1 BIGINT) ENGINE="InnoDB";
-CREATE TABLE mysqltest1.t18 (f1 BIGINT) ENGINE="InnoDB";
-CREATE TABLE mysqltest1.t19 (f1 BIGINT) ENGINE="InnoDB";
-CREATE TEMPORARY TABLE mysqltest1.t23 (f1 BIGINT);
-SET AUTOCOMMIT = 0;
-use mysqltest1;
-
--------- switch to slave --------
-SET AUTOCOMMIT = 0;
-use mysqltest1;
-
--------- switch to master -------
-
-######## COMMIT  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 0 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-1
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-0
-
--------- switch to master -------
-COMMIT;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-1
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-1
-
--------- switch to master -------
-ROLLBACK;
-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)
-1
-
-TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
-
--------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
-
-######## ROLLBACK  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 1 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-2
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-1
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-1
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-1
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-1
-
-TEST-INFO: MASTER: The INSERT is not committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-1
-
-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  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 1 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-2
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-1
-
--------- switch to master -------
-SET AUTOCOMMIT=1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-2
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-2
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-2
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-2
-
-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  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 2 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-3
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-2
-
--------- switch to master -------
-START TRANSACTION;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-3
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-3
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-3
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-3
-
-TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
-
--------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
-
-######## BEGIN  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 3 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-4
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-3
-
--------- switch to master -------
-BEGIN;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-4
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-4
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-4
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-4
-
-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  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 4 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-5
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-4
-
--------- switch to master -------
-DROP TABLE mysqltest1.t2;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-5
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-5
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-5
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-5
-
-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)
-
--------- switch to slave --------
-SHOW TABLES LIKE 't2';
-Tables_in_mysqltest1 (t2)
-
--------- switch to master -------
-
-######## DROP TEMPORARY TABLE mysqltest1.t23  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 5 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-6
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-5
-
--------- switch to master -------
-DROP TEMPORARY TABLE mysqltest1.t23;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-6
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-5
-
--------- switch to master -------
-ROLLBACK;
-Warnings:
-Warning	1196	Some non-transactional changed tables couldn't be rolled back
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-5
-
-TEST-INFO: MASTER: The INSERT is not committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-6
-
-TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
-
--------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
-SHOW TABLES LIKE 't23';
-Tables_in_mysqltest1 (t23)
-
--------- switch to slave --------
-SHOW TABLES LIKE 't23';
-Tables_in_mysqltest1 (t23)
-
--------- switch to master -------
-
-######## RENAME TABLE mysqltest1.t3 to mysqltest1.t20  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 5 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-6
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-6
-
--------- switch to master -------
-RENAME TABLE mysqltest1.t3 to mysqltest1.t20;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-6
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-6
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-6
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-6
-
-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
-
--------- switch to slave --------
-SHOW TABLES LIKE 't20';
-Tables_in_mysqltest1 (t20)
-t20
-
--------- switch to master -------
-
-######## ALTER TABLE mysqltest1.t4 ADD column f2 BIGINT  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 6 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-7
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-6
-
--------- switch to master -------
-ALTER TABLE mysqltest1.t4 ADD column f2 BIGINT;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-7
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-7
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-7
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-7
-
-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	
-f2	bigint(20)	YES		NULL	
-
--------- switch to slave --------
-describe mysqltest1.t4;
-Field	Type	Null	Key	Default	Extra
-f1	bigint(20)	YES		NULL	
-f2	bigint(20)	YES		NULL	
-
--------- switch to master -------
-
-######## CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "InnoDB"  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 7 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-8
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-7
-
--------- switch to master -------
-CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "InnoDB";
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-8
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-8
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-8
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-8
-
-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)  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 8 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-9
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-8
-
--------- switch to master -------
-CREATE TEMPORARY TABLE mysqltest1.t22 (f1 BIGINT);
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-9
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-8
-
--------- switch to master -------
-ROLLBACK;
-Warnings:
-Warning	1196	Some non-transactional changed tables couldn't be rolled back
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-8
-
-TEST-INFO: MASTER: The INSERT is not committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-9
-
-TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)
-
--------- switch to master -------
-flush logs;
-
--------- switch to slave --------
-flush logs;
-
--------- switch to master -------
-
-######## TRUNCATE TABLE mysqltest1.t7  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 8 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-9
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-9
-
--------- switch to master -------
-TRUNCATE TABLE mysqltest1.t7;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-9
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-9
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-9
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-9
-
-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  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 9 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-10
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-9
-
--------- switch to master -------
-LOCK TABLES mysqltest1.t1 WRITE, mysqltest1.t8 READ;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-10
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-10
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-10
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-10
-
-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  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 10 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-11
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-10
-
--------- switch to master -------
-UNLOCK TABLES;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-11
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-10
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-10
-
-TEST-INFO: MASTER: The INSERT is not committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-10
-
-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  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 10 + 1;
-ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-10
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-10
-
--------- switch to master -------
-UNLOCK TABLES;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-10
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-10
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-10
-
-TEST-INFO: MASTER: The INSERT is not committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-10
-
-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  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 10 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-11
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-10
-
--------- switch to master -------
-UNLOCK TABLES;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-11
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-11
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-11
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-11
-
-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  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 11 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-12
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-11
-
--------- switch to master -------
-DROP INDEX my_idx6 ON mysqltest1.t6;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-12
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-12
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-12
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-12
-
-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
-
--------- switch to slave --------
-SHOW INDEX FROM mysqltest1.t6;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-
--------- switch to master -------
-
-######## CREATE INDEX my_idx5 ON mysqltest1.t5(f1)  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 12 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-13
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-12
-
--------- switch to master -------
-CREATE INDEX my_idx5 ON mysqltest1.t5(f1);
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-13
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-13
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-13
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-13
-
-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	
-
--------- switch to slave --------
-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	NULL	NULL	NULL	YES	BTREE	
-
--------- switch to master -------
-
-######## DROP DATABASE mysqltest2  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 13 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-14
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-13
-
--------- switch to master -------
-DROP DATABASE mysqltest2;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-14
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-14
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-14
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-14
-
-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)
-
--------- switch to slave --------
-SHOW DATABASES LIKE "mysqltest2";
-Database (mysqltest2)
-
--------- switch to master -------
-
-######## CREATE DATABASE mysqltest3  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 14 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-15
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-14
-
--------- switch to master -------
-CREATE DATABASE mysqltest3;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-15
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-15
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-15
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-15
-
-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
-
--------- switch to slave --------
-SHOW DATABASES LIKE "mysqltest3";
-Database (mysqltest3)
-mysqltest3
-
--------- switch to master -------
-
-######## CREATE PROCEDURE p1() READS SQL DATA SELECT "this is p1"  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 15 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-16
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-15
-
--------- switch to master -------
-CREATE PROCEDURE p1() READS SQL DATA SELECT "this is p1";
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-16
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-16
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-16
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-16
-
-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
-Type	PROCEDURE
-Definer	root@localhost
-Modified	#
-Created	#
-Security_type	DEFINER
-Comment	
-	-------- switch to slave -------
-SHOW PROCEDURE STATUS LIKE 'p1';
-Db	mysqltest1
-Name	p1
-Type	PROCEDURE
-Definer	@
-Modified	#
-Created	#
-Security_type	DEFINER
-Comment	
-
-######## ALTER PROCEDURE p1 COMMENT "I have been altered"  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 16 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-17
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-16
-
--------- switch to master -------
-ALTER PROCEDURE p1 COMMENT "I have been altered";
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-17
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-17
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-17
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-17
-
-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
-Type	PROCEDURE
-Definer	root@localhost
-Modified	#
-Created	#
-Security_type	DEFINER
-Comment	I have been altered
-	-------- switch to slave -------
-SHOW PROCEDURE STATUS LIKE 'p1';
-Db	mysqltest1
-Name	p1
-Type	PROCEDURE
-Definer	@
-Modified	#
-Created	#
-Security_type	DEFINER
-Comment	I have been altered
-
-######## DROP PROCEDURE p1  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 17 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-18
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-17
-
--------- switch to master -------
-DROP PROCEDURE p1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-18
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-18
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-18
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-18
-
-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';
-	-------- switch to slave -------
-SHOW PROCEDURE STATUS LIKE 'p1';
-
-######## CREATE OR REPLACE VIEW v1 as select * from t1  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 18 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-19
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-18
-
--------- switch to master -------
-CREATE OR REPLACE VIEW v1 as select * from t1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-19
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-19
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-19
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-19
-
-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 -------
-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 -------
-INSERT INTO t1 SET f1= 19 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-20
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-19
-
--------- switch to master -------
-ALTER VIEW v1 AS select f1 from t1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-20
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-20
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-20
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-20
-
-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 -------
-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 -------
-INSERT INTO t1 SET f1= 20 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-21
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-20
-
--------- switch to master -------
-DROP VIEW IF EXISTS v1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-21
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-21
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-21
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-21
-
-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 -------
-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 -------
-INSERT INTO t1 SET f1= 21 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-22
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-21
-
--------- switch to master -------
-CREATE TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW SET @a:=1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-22
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-22
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-22
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-22
-
-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 -------
-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 -------
-INSERT INTO t1 SET f1= 22 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-23
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-22
-
--------- switch to master -------
-DROP TRIGGER trg1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-23
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-23
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-23
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-23
-
-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 -------
-SHOW TRIGGERS;
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
-
-######## CREATE USER user1@localhost  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 23 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-24
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-23
-
--------- switch to master -------
-CREATE USER user1@localhost;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-24
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-24
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-24
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-24
-
-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 -------
-SELECT user FROM mysql.user WHERE user = 'user1';
-user
-user1
-
-######## RENAME USER user1@localhost TO rename1@localhost  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 24 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-25
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-24
-
--------- switch to master -------
-RENAME USER user1@localhost TO rename1@localhost;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-25
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-25
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-25
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-25
-
-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 -------
-SELECT user FROM mysql.user WHERE user = 'rename1';
-user
-rename1
-
-######## DROP USER rename1@localhost  ########
-
--------- switch to master -------
-INSERT INTO t1 SET f1= 25 + 1;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-26
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-25
-
--------- switch to master -------
-DROP USER rename1@localhost;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-26
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-26
-
--------- switch to master -------
-ROLLBACK;
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-26
-
-TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-
--------- switch to slave --------
-SELECT MAX(f1) FROM t1;
-MAX(f1)
-26
-
-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 -------
-SELECT user FROM mysql.user WHERE user = 'rename1';
-user
-DROP DATABASE IF EXISTS mysqltest1;
-DROP DATABASE IF EXISTS mysqltest2;
-DROP DATABASE IF EXISTS mysqltest3;
diff --git a/mysql-test/r/rpl_stm_err_ignoredtable.result b/mysql-test/r/rpl_stm_err_ignoredtable.result
deleted file mode 100644
index 42abb2c3c44..00000000000
--- a/mysql-test/r/rpl_stm_err_ignoredtable.result
+++ /dev/null
@@ -1,39 +0,0 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
-create table t1 (a int primary key);
-insert into t1 values (1),(1);
-ERROR 23000: Duplicate entry '1' for key 1
-show slave status;
-Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	292	#	#	master-bin.000001	Yes	Yes				test.t3,test.t1,test.t2			0		0	292	#	None		0	No						#
-show tables like 't1';
-Tables_in_test (t1)
-drop table t1;
-select get_lock('crash_lock%20C', 10);
-get_lock('crash_lock%20C', 10)
-1
-create table t2 (a int primary key);
-insert into t2 values(1);
-create table t3 (id int);
-insert into t3 values(connection_id());
- update t2 set a = a + 1 + get_lock('crash_lock%20C', 10);
-select (@id := id) - id from t3;
-(@id := id) - id
-0
-kill @id;
-drop table t2,t3;
-show binlog events from 102;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int primary key)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values (1),(1)
-master-bin.000001	#	Query	1	#	use `test`; drop table t1
-master-bin.000001	#	Query	1	#	use `test`; create table t2 (a int primary key)
-master-bin.000001	#	Query	1	#	use `test`; insert into t2 values(1)
-master-bin.000001	#	Query	1	#	use `test`; create table t3 (id int)
-master-bin.000001	#	Query	1	#	use `test`; insert into t3 values(connection_id())
-master-bin.000001	#	Query	1	#	use `test`; update t2 set a = a + 1 + get_lock('crash_lock%20C', 10)
-master-bin.000001	#	Query	1	#	use `test`; drop table t2,t3
diff --git a/mysql-test/r/rpl_stm_loaddata_m.result b/mysql-test/r/rpl_stm_loaddata_m.result
deleted file mode 100644
index 9c7dba0e711..00000000000
--- a/mysql-test/r/rpl_stm_loaddata_m.result
+++ /dev/null
@@ -1,20 +0,0 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
-drop database if exists mysqltest;
-stop slave;
-create database mysqltest;
-use mysqltest;
-create table t1(a int, b int, unique(b));
-load data infile '../../std_data/rpl_loaddata.dat' into table t1;
-show binlog events from 102;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	drop database if exists mysqltest
-master-bin.000001	#	Query	1	#	create database mysqltest
-master-bin.000001	#	Query	1	#	use `mysqltest`; create table t1(a int, b int, unique(b))
-master-bin.000001	#	Begin_load_query	1	#	;file_id=1;block_len=12
-master-bin.000001	#	Execute_load_query	1	#	use `mysqltest`; load data infile '../../std_data/rpl_loaddata.dat' into table t1 ;file_id=1
-drop database mysqltest;
diff --git a/mysql-test/r/rpl_stm_rewrt_db.result b/mysql-test/r/rpl_stm_rewrt_db.result
deleted file mode 100644
index 6c72e982e3e..00000000000
--- a/mysql-test/r/rpl_stm_rewrt_db.result
+++ /dev/null
@@ -1,93 +0,0 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
-drop database if exists mysqltest1;
-create database mysqltest1;
-use mysqltest1;
-create table t1 (a int);
-insert into t1 values(9);
-select * from mysqltest1.t1;
-a
-9
-show databases like 'mysqltest1';
-Database (mysqltest1)
-mysqltest1
-select * from test.t1;
-a
-9
-drop table t1;
-drop database mysqltest1;
-drop database if exists rewrite;
-create database rewrite;
-use test;
-create table t1 (a date, b date, c date not null, d date);
-load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',';
-Warnings:
-Warning	1265	Data truncated for column 'a' at row 1
-Warning	1265	Data truncated for column 'c' at row 1
-Warning	1265	Data truncated for column 'd' at row 1
-Warning	1265	Data truncated for column 'a' at row 2
-Warning	1265	Data truncated for column 'b' at row 2
-Warning	1265	Data truncated for column 'd' at row 2
-load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',' IGNORE 2 LINES;
-select * from rewrite.t1;
-a	b	c	d
-0000-00-00	NULL	0000-00-00	0000-00-00
-0000-00-00	0000-00-00	0000-00-00	0000-00-00
-2003-03-03	2003-03-03	2003-03-03	NULL
-2003-03-03	2003-03-03	2003-03-03	NULL
-truncate table t1;
-load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',' LINES STARTING BY ',' (b,c,d);
-Warnings:
-Warning	1265	Data truncated for column 'c' at row 1
-Warning	1265	Data truncated for column 'd' at row 1
-Warning	1265	Data truncated for column 'b' at row 2
-Warning	1265	Data truncated for column 'd' at row 2
-select * from rewrite.t1;
-a	b	c	d
-NULL	NULL	0000-00-00	0000-00-00
-NULL	0000-00-00	0000-00-00	0000-00-00
-NULL	2003-03-03	2003-03-03	NULL
-drop table t1;
-create table t1 (a text, b text);
-load data infile '../../std_data/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
-Warnings:
-Warning	1261	Row 3 doesn't contain data for all columns
-select concat('|',a,'|'), concat('|',b,'|') from rewrite.t1;
-concat('|',a,'|')	concat('|',b,'|')
-|Field A|	|Field B|
-|Field 1|	|Field 2' 
-Field 3,'Field 4|
-|Field 5' ,'Field 6|	NULL
-|Field 6|	| 'Field 7'|
-drop table t1;
-create table t1 (a int, b char(10));
-load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines;
-Warnings:
-Warning	1264	Out of range value for column 'a' at row 3
-Warning	1262	Row 3 was truncated; it contained more data than there were input columns
-Warning	1264	Out of range value for column 'a' at row 5
-Warning	1262	Row 5 was truncated; it contained more data than there were input columns
-select * from rewrite.t1;
-a	b
-1	row 1
-2	row 2
-0	1234567890
-3	row 3
-0	1234567890
-truncate table t1;
-load data infile '../../std_data/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines;
-Warnings:
-Warning	1264	Out of range value for column 'a' at row 4
-Warning	1261	Row 4 doesn't contain data for all columns
-select * from rewrite.t1;
-a	b
-1	row 1
-2	row 2
-3	row 3
-0	
-drop database rewrite;
-drop table t1;
diff --git a/mysql-test/r/rpl_stm_timezone.result b/mysql-test/r/rpl_stm_timezone.result
deleted file mode 100644
index 64d05aa787e..00000000000
--- a/mysql-test/r/rpl_stm_timezone.result
+++ /dev/null
@@ -1,127 +0,0 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
-set timestamp=100000000;
-create table t1 (t timestamp);
-create table t2 (t char(32));
-select @@time_zone;
-@@time_zone
-Japan
-select @@time_zone;
-@@time_zone
-Europe/Moscow
-insert into t1 values ('20050101000000'), ('20050611093902');
-set time_zone='UTC';
-insert into t1 values ('20040101000000'), ('20040611093902');
-select * from t1;
-t
-2004-12-31 21:00:00
-2005-06-11 05:39:02
-2004-01-01 00:00:00
-2004-06-11 09:39:02
-set time_zone='UTC';
-select * from t1;
-t
-2004-12-31 21:00:00
-2005-06-11 05:39:02
-2004-01-01 00:00:00
-2004-06-11 09:39:02
-delete from t1;
-set time_zone='Europe/Moscow';
-insert into t1 values ('20040101000000'), ('20040611093902');
-select * from t1;
-t
-2004-01-01 00:00:00
-2004-06-11 09:39:02
-set time_zone='Europe/Moscow';
-select * from t1;
-t
-2004-01-01 00:00:00
-2004-06-11 09:39:02
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
-/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
-ROLLBACK;
-use test;
-SET TIMESTAMP=100000000;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
-SET @@session.sql_mode=0;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
-create table t1 (t timestamp);
-SET TIMESTAMP=100000000;
-create table t2 (t char(32));
-SET TIMESTAMP=100000000;
-SET @@session.time_zone='Europe/Moscow';
-insert into t1 values ('20050101000000'), ('20050611093902');
-SET TIMESTAMP=100000000;
-SET @@session.time_zone='UTC';
-insert into t1 values ('20040101000000'), ('20040611093902');
-SET TIMESTAMP=100000000;
-delete from t1;
-SET TIMESTAMP=100000000;
-SET @@session.time_zone='Europe/Moscow';
-insert into t1 values ('20040101000000'), ('20040611093902');
-# End of log file
-ROLLBACK /* added by mysqlbinlog */;
-/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
-delete from t1;
-set time_zone='UTC';
-load data infile '../../std_data/rpl_timezone.dat' into table t1;
-select * from t1;
-t
-2004-01-01 00:00:00
-2004-06-11 09:39:02
-set time_zone='UTC';
-select * from t1;
-t
-2004-01-01 00:00:00
-2004-06-11 09:39:02
-set time_zone='Europe/Moscow';
-set time_zone='Europe/Moscow';
-delete from t1;
-insert into t1 values ('20040101000000'), ('20040611093902');
-set time_zone='MET';
-insert into t2 (select t from t1);
-select * from t1;
-t
-2003-12-31 22:00:00
-2004-06-11 07:39:02
-select * from t2;
-t
-2003-12-31 22:00:00
-2004-06-11 07:39:02
-delete from t2;
-set timestamp=1000072000;
-insert into t2 values (current_timestamp), (current_date), (current_time);
-select * from t2;
-t
-2001-09-09 23:46:40
-2001-09-09
-23:46:40
-delete from t2;
-insert into t2 values (from_unixtime(1000000000)),
-(unix_timestamp('2001-09-09 03:46:40'));
-select * from t2;
-t
-2001-09-09 03:46:40
-1000000000
-select * from t2;
-t
-2001-09-09 03:46:40
-1000000000
-set global time_zone='MET';
-delete from t2;
-set time_zone='UTC';
-insert into t2 values(convert_tz('2004-01-01 00:00:00','MET',@@time_zone));
-insert into t2 values(convert_tz('2005-01-01 00:00:00','MET','Japan'));
-select * from t2;
-t
-2003-12-31 23:00:00
-2005-01-01 08:00:00
-select * from t2;
-t
-2003-12-31 23:00:00
-2005-01-01 08:00:00
-drop table t1, t2;
diff --git a/mysql-test/r/rpl_stm_user_variables.result b/mysql-test/r/rpl_stm_user_variables.result
deleted file mode 100644
index 3e2efcbe9da..00000000000
--- a/mysql-test/r/rpl_stm_user_variables.result
+++ /dev/null
@@ -1,82 +0,0 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
-reset master;
-create table t1(n char(30));
-set @i1:=12345678901234, @i2:=-12345678901234, @i3:=0, @i4:=-1;
-set @s1:='This is a test', @r1:=12.5, @r2:=-12.5;
-set @n1:=null;
-set @s2:='', @s3:='abc\'def', @s4:= 'abc\\def', @s5:= 'abc''def';
-insert into t1 values (@i1), (@i2), (@i3), (@i4);
-insert into t1 values (@r1), (@r2);
-insert into t1 values (@s1), (@s2), (@s3), (@s4), (@s5);
-insert into t1 values (@n1);
-insert into t1 values (@n2);
-insert into t1 values (@a:=0), (@a:=@a+1), (@a:=@a+1);
-insert into t1 values (@a+(@b:=@a+1));
-set @q:='abc';
-insert t1 values (@q), (@q:=concat(@q, 'n1')), (@q:=concat(@q, 'n2'));
-set @a:=5;
-insert into t1 values (@a),(@a);
-select * from t1 where n = '<nonexistant>';
-n
-insert into t1 values (@a),(@a),(@a*5);
-select * from t1;
-n
-12345678901234
--12345678901234
-0
--1
-12.5
--12.5
-This is a test
-
-abc'def
-abc\def
-abc'def
-NULL
-NULL
-0
-1
-2
-5
-abc
-abcn1
-abcn1n2
-5
-5
-NULL
-NULL
-NULL
-select * from t1;
-n
-12345678901234
--12345678901234
-0
--1
-12.5
--12.5
-This is a test
-
-abc'def
-abc\def
-abc'def
-NULL
-NULL
-0
-1
-2
-5
-abc
-abcn1
-abcn1n2
-5
-5
-NULL
-NULL
-NULL
-drop table t1;
-stop slave;
diff --git a/mysql-test/r/rpl_stm_view.result b/mysql-test/r/rpl_stm_view.result
deleted file mode 100644
index cf4c161b296..00000000000
--- a/mysql-test/r/rpl_stm_view.result
+++ /dev/null
@@ -1,56 +0,0 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
-drop table if exists t1,v1;
-drop view if exists t1,v1;
-reset master;
-create table t1 (a int);
-insert into t1 values (1);
-create view v1 as select a from t1;
-insert into v1 values (2);
-select * from v1 order by a;
-a
-1
-2
-select * from v1 order by a;
-a
-1
-2
-update v1 set a=3 where a=1;
-select * from v1 order by a;
-a
-2
-3
-select * from v1 order by a;
-a
-2
-3
-delete from v1 where a=2;
-select * from v1 order by a;
-a
-3
-select * from v1 order by a;
-a
-3
-alter view v1 as select a as b from t1;
-select * from v1 order by 1;
-b
-3
-drop view v1;
-select * from v1 order by a;
-ERROR 42S02: Table 'test.v1' doesn't exist
-drop table t1;
-show binlog events limit 1,100;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	#	Query	1	#	use `test`; create table t1 (a int)
-slave-bin.000001	#	Query	1	#	use `test`; insert into t1 values (1)
-slave-bin.000001	#	Query	1	#	use `test`; CREATE ALGORITHM=UNDEFINED DEFINER=root@localhost SQL SECURITY DEFINER VIEW v1 AS select a from t1
-slave-bin.000001	#	Query	1	#	use `test`; insert into v1 values (2)
-slave-bin.000001	#	Query	1	#	use `test`; update v1 set a=3 where a=1
-slave-bin.000001	#	Query	1	#	use `test`; delete from v1 where a=2
-slave-bin.000001	#	Query	1	#	use `test`; ALTER ALGORITHM=UNDEFINED DEFINER=root@localhost SQL SECURITY DEFINER VIEW v1 AS select a as b from t1
-slave-bin.000001	#	Query	1	#	use `test`; drop view v1
-slave-bin.000001	#	Query	1	#	use `test`; drop table t1
diff --git a/mysql-test/r/rpl_row_timezone.result b/mysql-test/r/rpl_timezone.result
index 26c10648ffb..9c45997cbf6 100644
--- a/mysql-test/r/rpl_row_timezone.result
+++ b/mysql-test/r/rpl_timezone.result
@@ -9,7 +9,7 @@ create table t1 (t timestamp, n int not null auto_increment, PRIMARY KEY(n));
 create table t2 (t char(32), n int not null auto_increment, PRIMARY KEY(n));
 select @@time_zone;
 @@time_zone
-Europe/Moscow
+Japan
 select @@time_zone;
 @@time_zone
 Europe/Moscow
@@ -23,10 +23,10 @@ t	n
 2004-06-11 09:39:02	4
 select * from t1;
 t	n
-2005-01-01 00:00:00	1
-2005-06-11 09:39:02	2
-2004-01-01 00:00:00	3
-2004-06-11 09:39:02	4
+2005-01-01 06:00:00	1
+2005-06-11 14:39:02	2
+2004-01-01 06:00:00	3
+2004-06-11 14:39:02	4
 delete from t1;
 set time_zone='Europe/Moscow';
 insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL);
@@ -39,22 +39,6 @@ select * from t1;
 t	n
 2004-01-01 00:00:00	5
 2004-06-11 09:39:02	6
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
-/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
-ROLLBACK;
-use test;
-SET TIMESTAMP=100000000;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
-SET @@session.sql_mode=0;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
-create table t1 (t timestamp, n int not null auto_increment, PRIMARY KEY(n));
-SET TIMESTAMP=100000000;
-create table t2 (t char(32), n int not null auto_increment, PRIMARY KEY(n));
-SET TIMESTAMP=100000000;
-delete from t1;
-# End of log file
-ROLLBACK /* added by mysqlbinlog */;
-/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 delete from t1;
 set time_zone='UTC';
 load data infile '../../std_data/rpl_timezone2.dat' into table t1;
diff --git a/mysql-test/r/rpl_row_user_variables.result b/mysql-test/r/rpl_user_variables.result
index 3e2efcbe9da..3e2efcbe9da 100644
--- a/mysql-test/r/rpl_row_user_variables.result
+++ b/mysql-test/r/rpl_user_variables.result
diff --git a/mysql-test/r/rpl_row_view.result b/mysql-test/r/rpl_view.result
index ce807a361ba..f038f4d00cb 100644
--- a/mysql-test/r/rpl_row_view.result
+++ b/mysql-test/r/rpl_view.result
@@ -6,6 +6,7 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 drop table if exists t1,v1;
 drop view if exists t1,v1;
+reset master;
 create table t1 (a int);
 insert into t1 values (1);
 create view v1 as select a from t1;