bzr commit into mysql-next-mr-bugfixing branch (luis.soares:2977) Bug#51426

[Luis Soares]

#At file:///home/lsoares/Workspace/bzr/work/bugfixing/51426/mysql-next-mr-bugfixing/ based on revid:luis.soares@stripped

 2977 Luis Soares	2010-03-04
      BUG#51426
      
      Addressing review comments.
      Test case improvements.

    modified:
      mysql-test/suite/rpl/r/rpl_stm_user_variables.result
      mysql-test/suite/rpl/t/rpl_stm_user_variables.test
=== modified file 'mysql-test/suite/rpl/r/rpl_stm_user_variables.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_user_variables.result	2010-02-25 00:47:52 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_user_variables.result	2010-03-04 23:53:35 +0000
@@ -212,10 +212,10 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-CREATE TABLE t1 ( c1 INT AUTO_INCREMENT, c2 BIGINT, PRIMARY KEY (c1));
-CREATE TRIGGER tr1 AFTER INSERT ON t1 FOR EACH ROW SET @aux = 1 ;
+CREATE TABLE t1 ( c INT, PRIMARY KEY (c)) Engine=MyISAM;
+CREATE TRIGGER tr1 AFTER INSERT ON t1 FOR EACH ROW SET @aux = -1 ;
 SET @aux = 10294947273192243200;
-INSERT INTO t1 VALUES (@aux, 1) , (20030914140121, 2);
+INSERT INTO t1 VALUES (@aux) , (@aux);
 ERROR 23000: Duplicate entry '2147483647' for key 'PRIMARY'
 ## assertion: master and slave tables are in sync
 Comparing tables master:test.t1 and slave:test.t1

=== modified file 'mysql-test/suite/rpl/t/rpl_stm_user_variables.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_user_variables.test	2010-02-25 00:47:52 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_user_variables.test	2010-03-04 23:53:35 +0000
@@ -142,21 +142,21 @@ DROP TABLE t1;
 
 #####################################################################
 #
-# BUG#51426: overflow for auto_increment column causes slave to stop
+# BUG#51426
 #
 #####################################################################
 -- source include/master-slave-reset.inc
 -- connection master
 
-CREATE TABLE t1 ( c1 INT AUTO_INCREMENT, c2 BIGINT, PRIMARY KEY (c1));
+CREATE TABLE t1 ( c INT, PRIMARY KEY (c)) Engine=MyISAM;
 
 # offending trigger that would reset the unsigned flag for aux before
 # binlogging of User_var_log_event would take place.
-CREATE TRIGGER tr1 AFTER INSERT ON t1 FOR EACH ROW SET @aux = 1 ;
+CREATE TRIGGER tr1 AFTER INSERT ON t1 FOR EACH ROW SET @aux = -1 ;
 
 SET @aux = 10294947273192243200;
 -- error ER_DUP_ENTRY
-INSERT INTO t1 VALUES (@aux, 1) , (20030914140121, 2);
+INSERT INTO t1 VALUES (@aux) , (@aux);
 
 -- sync_slave_with_master
 


Attachment: [text/bzr-bundle] bzr/[e-mail]