List:Commits« Previous MessageNext Message »
From:Alfranio Correia Date:April 8 2009 9:02pm
Subject:bzr commit into mysql-5.1-bugteam branch (alfranio.correia:2856)
Bug#39393
View as plain text  
#At file:///home/acorreia/workspace.sun/repository.mysql/bzrwork/bug-39393/mysql-5.1-bugteam-push/ based on revid:alfranio.correia@stripped

 2856 Alfranio Correia	2009-04-08
      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.
modified:
  mysql-test/suite/rpl/r/rpl_skip_error.result
  mysql-test/suite/rpl/t/rpl_skip_error.test

=== modified file 'mysql-test/suite/rpl/r/rpl_skip_error.result'
--- a/mysql-test/suite/rpl/r/rpl_skip_error.result	2009-04-08 10:07:24 +0000
+++ b/mysql-test/suite/rpl/r/rpl_skip_error.result	2009-04-08 21:02:19 +0000
@@ -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;

=== modified file 'mysql-test/suite/rpl/t/rpl_skip_error.test'
--- a/mysql-test/suite/rpl/t/rpl_skip_error.test	2009-04-05 12:03:04 +0000
+++ b/mysql-test/suite/rpl/t/rpl_skip_error.test	2009-04-08 21:02:19 +0000
@@ -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 ====
 

Thread
bzr commit into mysql-5.1-bugteam branch (alfranio.correia:2856)Bug#39393Alfranio Correia8 Apr