diff --git a/mysql-test/suite/rpl/r/rpl_skip_error.result b/mysql-test/suite/rpl/r/rpl_skip_error.result index dc02bb783ae..d955859f030 100644 --- a/mysql-test/suite/rpl/r/rpl_skip_error.result +++ b/mysql-test/suite/rpl/r/rpl_skip_error.result @@ -153,17 +153,8 @@ DELETE FROM t1 WHERE id = 4; SET SQL_LOG_BIN=1; UPDATE t1 SET id= id + 3, data = 2; -SELECT *, "INNODB SET SLAVE DATA" FROM t1 ORDER BY id; -id data INNODB SET SLAVE DATA -1 1 INNODB SET SLAVE DATA -2 1 INNODB SET SLAVE DATA -3 1 INNODB SET SLAVE DATA -4 1 INNODB SET SLAVE DATA -SELECT *, "INNODB SET MASTER DATA" FROM t1 ORDER BY id; -id data INNODB SET MASTER DATA -4 2 INNODB SET MASTER DATA -5 2 INNODB SET MASTER DATA -6 2 INNODB SET MASTER DATA +**** We cannot execute a select as there are differences in the +**** behavior between STMT and RBR. ==== Using MyIsam ==== SET SQL_LOG_BIN=0; CREATE TABLE t2(id INT NOT NULL PRIMARY KEY, data INT) Engine=MyIsam; @@ -192,17 +183,8 @@ DELETE FROM t2 WHERE id = 5; SET SQL_LOG_BIN=1; UPDATE t2 SET id= id + 3, data = 2; -SELECT *, "MYISAM SET SLAVE DATA" FROM t2 ORDER BY id; -id data MYISAM SET SLAVE DATA -2 1 MYISAM SET SLAVE DATA -3 1 MYISAM SET SLAVE DATA -4 2 MYISAM SET SLAVE DATA -5 1 MYISAM SET SLAVE DATA -SELECT *, "MYISAM SET MASTER DATA" FROM t2 ORDER BY id; -id data MYISAM SET MASTER DATA -4 2 MYISAM SET MASTER DATA -5 2 MYISAM SET MASTER DATA -6 2 MYISAM SET MASTER DATA +**** We cannot execute a select as there are differences in the +**** behavior between STMT and RBR. ==== Clean Up ==== DROP TABLE t1; DROP TABLE t2; diff --git a/mysql-test/suite/rpl/t/rpl_skip_error.test b/mysql-test/suite/rpl/t/rpl_skip_error.test index c15d24be9e5..9c6aa3dcb57 100644 --- a/mysql-test/suite/rpl/t/rpl_skip_error.test +++ b/mysql-test/suite/rpl/t/rpl_skip_error.test @@ -122,13 +122,8 @@ sync_slave_with_master; let $error= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1); echo $error; -connection slave; - -SELECT *, "INNODB SET SLAVE DATA" FROM t1 ORDER BY id; - -connection master; - -SELECT *, "INNODB SET MASTER DATA" FROM t1 ORDER BY id; +--echo **** We cannot execute a select as there are differences in the +--echo **** behavior between STMT and RBR. --echo ==== Using MyIsam ==== @@ -161,13 +156,8 @@ sync_slave_with_master; let $error= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1); echo $error; -connection slave; - -SELECT *, "MYISAM SET SLAVE DATA" FROM t2 ORDER BY id; - -connection master; - -SELECT *, "MYISAM SET MASTER DATA" FROM t2 ORDER BY id; +--echo **** We cannot execute a select as there are differences in the +--echo **** behavior between STMT and RBR. --echo ==== Clean Up ====