6 files changed, 28 insertions, 45 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_mdev4820.test b/mysql-test/suite/rpl/t/rpl_gtid_mdev4820.test
index 304816a65d1..7f4d851f95c 100644
--- a/mysql-test/suite/rpl/t/rpl_gtid_mdev4820.test
+++ b/mysql-test/suite/rpl/t/rpl_gtid_mdev4820.test
@@ -34,7 +34,7 @@ eval SET GLOBAL gtid_slave_pos= '$old_gtid_pos';
 
 --connection server_1
 INSERT INTO t1 VALUES (4);
---save_master_pos
+--source include/save_master_gtid.inc
 
 --connection server_2
 SET sql_log_bin= 0;
@@ -48,7 +48,7 @@ STOP SLAVE SQL_THREAD;
 eval SET GLOBAL gtid_slave_pos= '$old_gtid_pos';
 
 --source include/start_slave.inc
---sync_with_master
+--source include/sync_with_master_gtid.inc
 SELECT * FROM t1 ORDER BY a;
 
 --source include/stop_slave.inc
diff --git a/mysql-test/suite/rpl/t/rpl_innodb_bug30888.opt b/mysql-test/suite/rpl/t/rpl_innodb_bug30888.opt
new file mode 100644
index 00000000000..e6685732d90
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_innodb_bug30888.opt
@@ -0,0 +1 @@
+--innodb-flush-log-at-trx-commit=2
diff --git a/mysql-test/suite/rpl/t/rpl_row_to_stmt-master.opt b/mysql-test/suite/rpl/t/rpl_row_to_stmt-master.opt
new file mode 100644
index 00000000000..83ed8522e72
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_row_to_stmt-master.opt
@@ -0,0 +1 @@
+--binlog-format=row
diff --git a/mysql-test/suite/rpl/t/rpl_row_to_stmt-slave.opt b/mysql-test/suite/rpl/t/rpl_row_to_stmt-slave.opt
new file mode 100644
index 00000000000..af3a211967b
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_row_to_stmt-slave.opt
@@ -0,0 +1 @@
+--binlog-format=statement
diff --git a/mysql-test/suite/rpl/t/rpl_row_to_stmt.test b/mysql-test/suite/rpl/t/rpl_row_to_stmt.test
new file mode 100644
index 00000000000..5ca583d881f
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_row_to_stmt.test
@@ -0,0 +1,23 @@
+#
+# check that master starterd with log-format=ROW replication can replicate to
+# slave started with log-format=STATEMENT
+#
+
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+
+use test;
+
+create table t1 (a int primary key);
+insert into t1 values (1),(2),(3),(4),(5);
+update t1 set a=a*10;
+
+sync_slave_with_master;
+use test;
+select * from t1;
+source include/show_binlog_events.inc;
+
+connection master;
+drop table t1;
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_triggers_sbr.test b/mysql-test/suite/rpl/t/rpl_row_triggers_sbr.test
deleted file mode 100644
index a801363b931..00000000000
--- a/mysql-test/suite/rpl/t/rpl_row_triggers_sbr.test
+++ /dev/null
@@ -1,43 +0,0 @@
---source include/have_binlog_format_statement.inc
---source include/have_rbr_triggers.inc
---source include/master-slave.inc
-
---disable_query_log
-CALL mtr.add_suppression("Cannot execute statement: impossible to write to binary log since statement is in row format and BINLOG_FORMAT = STATEMENT");
---enable_query_log
-
-set binlog_format = row;
-
-create table t1 (i int);
-create table t2 (i int);
-
---sync_slave_with_master
---disable_query_log
-CALL mtr.add_suppression("impossible to write to binary log since statement is in row format and BINLOG_FORMAT = STATEMENT");
---enable_query_log
-
-SET @old_slave_run_triggers_for_rbr= @@global.slave_run_triggers_for_rbr;
-set global slave_run_triggers_for_rbr=YES;
-
-create trigger tr_before before insert on t1 for each row
-  insert into t2 values (1);
-
---connection master
-
-insert into t1 values (1);
-
---connection slave
-
---let $slave_sql_errno= 1666
---source include/wait_for_slave_sql_error_and_skip.inc
-
---connection master
-
-drop tables t1,t2;
-
---sync_slave_with_master
-SET @@global.slave_run_triggers_for_rbr= @old_slave_run_triggers_for_rbr;
-
---connection master
-
---source include/rpl_end.inc