bzr commit into mysql-6.0 branch (mats:2876)

[Mats Kindahl]

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

 2876 Mats Kindahl	2008-10-16 [merge]
      Merging 5.1-5.1.29-rc into 6.0-5.1.29-rc
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-10-15 20:03:33 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test	2008-10-16 08:05:46 +0000
@@ -478,7 +478,7 @@ sync_slave_with_master;
 
 connection master;
 
-CREATE TABLE t1 (a BIT, b INT, KEY (a), KEY (b));
+eval CREATE TABLE t1 (a BIT, b INT, KEY (a), KEY (b)) ENGINE=$type;
 
 INSERT IGNORE INTO t1 VALUES ('1', '-2146992385');
 UPDATE t1 SET a = 0 WHERE a = 1;
@@ -488,3 +488,22 @@ sync_slave_with_master;
 connection master;
 drop table t1;
 sync_slave_with_master;
+
+#
+# BUG#40001: Replication failure on RBR + no PK + field with index +
+#            field with no index 
+#
+
+connection master;
+
+eval CREATE TABLE t1 (a int, b int, key (a)) ENGINE=$type;
+
+INSERT IGNORE INTO t1 VALUES (NULL, '9');
+UPDATE t1 SET a = 5 WHERE b = 9;
+UPDATE t1 SET b = 0 WHERE a < 9;
+
+sync_slave_with_master;
+
+connection master;
+drop table t1;
+sync_slave_with_master;
\ No newline at end of file

=== modified file 'mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result	2008-10-15 20:03:33 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result	2008-10-16 08:05:46 +0000
@@ -527,9 +527,14 @@ 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));
+CREATE TABLE t1 (a BIT, b INT, KEY (a), KEY (b)) ENGINE='MYISAM' ;
 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;
+CREATE TABLE t1 (a int, b int, key (a)) ENGINE='MYISAM' ;
+INSERT IGNORE INTO t1 VALUES (NULL, '9');
+UPDATE t1 SET a = 5 WHERE b = 9;
+UPDATE t1 SET b = 0 WHERE a < 9;
+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-10-15 20:03:33 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result	2008-10-16 08:05:46 +0000
@@ -527,9 +527,14 @@ 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));
+CREATE TABLE t1 (a BIT, b INT, KEY (a), KEY (b)) ENGINE='INNODB' ;
 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;
+CREATE TABLE t1 (a int, b int, key (a)) ENGINE='INNODB' ;
+INSERT IGNORE INTO t1 VALUES (NULL, '9');
+UPDATE t1 SET a = 5 WHERE b = 9;
+UPDATE t1 SET b = 0 WHERE a < 9;
+drop table t1;