Commit 65ff9e1b authored by Alfranio Correia's avatar Alfranio Correia

BUG#39393. Post-fix for test rpl_skip_error.

The result set for multi-row statements is not the same between STMT and
RBR and among different versions. Thus to avoid test failures, we are not
printing out such result sets. Note, however, that this does not have
impact on coverage and accuracy since the execution is able to continue
without further issues when an error is found on the master and such error
is set to be skipped.
parent 0ac476e3
...@@ -153,17 +153,8 @@ DELETE FROM t1 WHERE id = 4; ...@@ -153,17 +153,8 @@ DELETE FROM t1 WHERE id = 4;
SET SQL_LOG_BIN=1; SET SQL_LOG_BIN=1;
UPDATE t1 SET id= id + 3, data = 2; UPDATE t1 SET id= id + 3, data = 2;
SELECT *, "INNODB SET SLAVE DATA" FROM t1 ORDER BY id; **** We cannot execute a select as there are differences in the
id data INNODB SET SLAVE DATA **** behavior between STMT and RBR.
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
==== Using MyIsam ==== ==== Using MyIsam ====
SET SQL_LOG_BIN=0; SET SQL_LOG_BIN=0;
CREATE TABLE t2(id INT NOT NULL PRIMARY KEY, data INT) Engine=MyIsam; CREATE TABLE t2(id INT NOT NULL PRIMARY KEY, data INT) Engine=MyIsam;
...@@ -192,17 +183,8 @@ DELETE FROM t2 WHERE id = 5; ...@@ -192,17 +183,8 @@ DELETE FROM t2 WHERE id = 5;
SET SQL_LOG_BIN=1; SET SQL_LOG_BIN=1;
UPDATE t2 SET id= id + 3, data = 2; UPDATE t2 SET id= id + 3, data = 2;
SELECT *, "MYISAM SET SLAVE DATA" FROM t2 ORDER BY id; **** We cannot execute a select as there are differences in the
id data MYISAM SET SLAVE DATA **** behavior between STMT and RBR.
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
==== Clean Up ==== ==== Clean Up ====
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;
...@@ -122,13 +122,8 @@ sync_slave_with_master; ...@@ -122,13 +122,8 @@ sync_slave_with_master;
let $error= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1); let $error= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1);
echo $error; echo $error;
connection slave; --echo **** We cannot execute a select as there are differences in the
--echo **** behavior between STMT and RBR.
SELECT *, "INNODB SET SLAVE DATA" FROM t1 ORDER BY id;
connection master;
SELECT *, "INNODB SET MASTER DATA" FROM t1 ORDER BY id;
--echo ==== Using MyIsam ==== --echo ==== Using MyIsam ====
...@@ -161,13 +156,8 @@ sync_slave_with_master; ...@@ -161,13 +156,8 @@ sync_slave_with_master;
let $error= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1); let $error= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1);
echo $error; echo $error;
connection slave; --echo **** We cannot execute a select as there are differences in the
--echo **** behavior between STMT and RBR.
SELECT *, "MYISAM SET SLAVE DATA" FROM t2 ORDER BY id;
connection master;
SELECT *, "MYISAM SET MASTER DATA" FROM t2 ORDER BY id;
--echo ==== Clean Up ==== --echo ==== Clean Up ====
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment