bzr commit into mysql-5.1 branch (mats:2771) Bug#40007

[Mats Kindahl]

#At file:///home/bzr/bugs/b40007-5.1-5.1.29-rc/

 2771 Mats Kindahl	2008-10-15
      Bug #40007: Replication failure with RBR + no PK + 2 indexed fields 
      
      Unable to reproduce failure, but adding test case according to report
      to avoid regressions.
modified:
  mysql-test/extra/rpl_tests/rpl_row_basic.test
  mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
  mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_basic.test'
--- a/mysql-test/extra/rpl_tests/rpl_row_basic.test	2008-09-03 20:04:07 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test	2008-10-15 19:36:46 +0000
@@ -471,3 +471,20 @@ source include/diff_tables.inc;
 connection master;
 drop table t1;
 sync_slave_with_master;
+
+#
+# BUG#40007: Replication failure with RBR + no PK + 2 indexed fields 
+#
+
+connection master;
+
+CREATE TABLE t1 (a BIT, b INT, KEY (a), KEY (b));
+
+INSERT IGNORE INTO t1 VALUES ('1', '-2146992385');
+UPDATE t1 SET a = 0 WHERE a = 1;
+
+sync_slave_with_master;
+
+connection master;
+drop table t1;
+sync_slave_with_master;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result	2008-09-03 20:04:07 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result	2008-10-15 19:36:46 +0000
@@ -527,3 +527,9 @@ ERROR 23000: Duplicate entry '10' for ke
 INSERT INTO t1 VALUES (4);
 Comparing tables master:test.t1 and slave:test.t1
 drop table t1;
+CREATE TABLE t1 (a BIT, b INT, KEY (a), KEY (b));
+INSERT IGNORE INTO t1 VALUES ('1', '-2146992385');
+Warnings:
+Warning	1264	Out of range value for column 'a' at row 1
+UPDATE t1 SET a = 0 WHERE a = 1;
+drop table t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result	2008-09-03 20:04:07 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result	2008-10-15 19:36:46 +0000
@@ -527,3 +527,9 @@ ERROR 23000: Duplicate entry '10' for ke
 INSERT INTO t1 VALUES (4);
 Comparing tables master:test.t1 and slave:test.t1
 drop table t1;
+CREATE TABLE t1 (a BIT, b INT, KEY (a), KEY (b));
+INSERT IGNORE INTO t1 VALUES ('1', '-2146992385');
+Warnings:
+Warning	1264	Out of range value for column 'a' at row 1
+UPDATE t1 SET a = 0 WHERE a = 1;
+drop table t1;