bk commit into 5.1 tree (knielsen:1.2534) BUG#22045

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen.  When knielsen does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-07 14:27:57+02:00, knielsen@ymer.(none) +6 -0
  BUG#22045.
  
  Move testcases to separate file as they currently fail in statement-based
  replication due to bug.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result@stripped, 2008-04-07 14:27:53+02:00,
knielsen@ymer.(none) +0 -48
    BUG#22045.
    
    Move testcases to separate file as they currently fail in statement-based
    replication due to bug.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result@stripped, 2008-04-07 14:27:53+02:00,
knielsen@ymer.(none) +0 -50
    BUG#22045.
    
    Move testcases to separate file as they currently fail in statement-based
    replication due to bug.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_bug22045.result@stripped, 2008-04-07 14:27:53+02:00,
knielsen@ymer.(none) +104 -0
    New BitKeeper file ``mysql-test/suite/rpl_ndb/r/rpl_ndb_bug22045.result''

  mysql-test/suite/rpl_ndb/r/rpl_ndb_bug22045.result@stripped, 2008-04-07 14:27:53+02:00,
knielsen@ymer.(none) +0 -0

  mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test@stripped, 2008-04-07 14:27:53+02:00,
knielsen@ymer.(none) +0 -32
    BUG#22045.
    
    Move testcases to separate file as they currently fail in statement-based
    replication due to bug.

  mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test@stripped, 2008-04-07 14:27:53+02:00,
knielsen@ymer.(none) +0 -34
    BUG#22045.
    
    Move testcases to separate file as they currently fail in statement-based
    replication due to bug.

  mysql-test/suite/rpl_ndb/t/rpl_ndb_bug22045.test@stripped, 2008-04-07 14:27:53+02:00,
knielsen@ymer.(none) +69 -0
    New BitKeeper file ``mysql-test/suite/rpl_ndb/t/rpl_ndb_bug22045.test''

  mysql-test/suite/rpl_ndb/t/rpl_ndb_bug22045.test@stripped, 2008-04-07 14:27:53+02:00,
knielsen@ymer.(none) +0 -0

diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result
b/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result	2008-04-04 11:54:15 +02:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result	2008-04-07 14:27:53 +02:00
@@ -229,51 +229,3 @@ c1
 104
 105
 DROP TABLE t1;
-create table t1 (a int primary key,
-b varchar(100) default 'b',
-c varchar(100)) engine=ndbcluster;
-insert into t1 values (1, 'b1', 'c1');
-insert into t1 (a) values (2);
-insert into t1 (a, b) values (3, 'b3');
-replace into t1 values (5, 'b5', 'c5');
-replace into t1 (a) values (6);
-replace into t1 (a, c) values (7, 'c7');
-select * from t1 order by a;
-a	b	c
-1	b1	c1
-2	b	NULL
-3	b3	NULL
-5	b5	c5
-6	b	NULL
-7	b	c7
-select * from t1 order by a;
-a	b	c
-1	b1	c1
-2	b	NULL
-3	b3	NULL
-5	b5	c5
-6	b	NULL
-7	b	c7
-replace into t1 (a) values (1);
-replace into t1 (a, b) values (2, 'b2x');
-replace into t1 (a, c) values (3, 'c3x');
-replace into t1 (a, b, c) values (5, 'b5x', 'c5x');
-replace into t1 (a) values (6);
-replace into t1 (a) values (7);
-select * from t1 order by a;
-a	b	c
-1	b	NULL
-2	b2x	NULL
-3	b	c3x
-5	b5x	c5x
-6	b	NULL
-7	b	NULL
-select * from t1 order by a;
-a	b	c
-1	b	NULL
-2	b2x	NULL
-3	b	c3x
-5	b5x	c5x
-6	b	NULL
-7	b	NULL
-drop table t1;
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result
b/mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result	2008-04-04 11:54:15 +02:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result	2008-04-07 14:27:53 +02:00
@@ -133,53 +133,3 @@ S	testtttttttttt	t1	8fc937d303ee7e4795c0
 S	testttttttttttt	t1	a5229e9f8977bc99afc3b3627c56f083e97e01bd	21	22	23	24	25
 S	testtttttttttttt	t1	0820e6ad3eeb06ea60e5e04d0bfe36f286b91098	31	32	33	34	35
 drop table t1;
-create table t1 (a int primary key,
-b varchar(100) default 'b',
-c varchar(100),
-d text,
-e text) engine=ndbcluster;
-insert into t1 values (1, 'b1', 'c1', 'd1', 'e1');
-insert into t1 (a) values (2);
-insert into t1 (a, b, d) values (3, 'b3', 'd3');
-replace into t1 values (5, 'b5', 'c5', 'd5', 'e5');
-replace into t1 (a) values (6);
-replace into t1 (a, c, e) values (7, 'c7', 'e7');
-select * from t1 order by a;
-a	b	c	d	e
-1	b1	c1	d1	e1
-2	b	NULL	NULL	NULL
-3	b3	NULL	d3	NULL
-5	b5	c5	d5	e5
-6	b	NULL	NULL	NULL
-7	b	c7	NULL	e7
-select * from t1 order by a;
-a	b	c	d	e
-1	b1	c1	d1	e1
-2	b	NULL	NULL	NULL
-3	b3	NULL	d3	NULL
-5	b5	c5	d5	e5
-6	b	NULL	NULL	NULL
-7	b	c7	NULL	e7
-replace into t1 (a) values (1);
-replace into t1 (a, b, d) values (2, 'b2x', 'd2x');
-replace into t1 (a, c, e) values (3, 'c3x', 'e3x');
-replace into t1 (a, b, c, d, e) values (5, 'b5x', 'c5x', 'd5x', 'e5x');
-replace into t1 (a) values (6);
-replace into t1 (a, e) values (7, 'e7x');
-select * from t1 order by a;
-a	b	c	d	e
-1	b	NULL	NULL	NULL
-2	b2x	NULL	d2x	NULL
-3	b	c3x	NULL	e3x
-5	b5x	c5x	d5x	e5x
-6	b	NULL	NULL	NULL
-7	b	NULL	NULL	e7x
-select * from t1 order by a;
-a	b	c	d	e
-1	b	NULL	NULL	NULL
-2	b2x	NULL	d2x	NULL
-3	b	c3x	NULL	e3x
-5	b5x	c5x	d5x	e5x
-6	b	NULL	NULL	NULL
-7	b	NULL	NULL	e7x
-drop table t1;
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_bug22045.result
b/mysql-test/suite/rpl_ndb/r/rpl_ndb_bug22045.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_bug22045.result	2008-04-07 14:27:53 +02:00
@@ -0,0 +1,104 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+create table t1 (a int primary key,
+b varchar(100) default 'b',
+c varchar(100)) engine=ndbcluster;
+insert into t1 values (1, 'b1', 'c1');
+insert into t1 (a) values (2);
+insert into t1 (a, b) values (3, 'b3');
+replace into t1 values (5, 'b5', 'c5');
+replace into t1 (a) values (6);
+replace into t1 (a, c) values (7, 'c7');
+select * from t1 order by a;
+a	b	c
+1	b1	c1
+2	b	NULL
+3	b3	NULL
+5	b5	c5
+6	b	NULL
+7	b	c7
+select * from t1 order by a;
+a	b	c
+1	b1	c1
+2	b	NULL
+3	b3	NULL
+5	b5	c5
+6	b	NULL
+7	b	c7
+replace into t1 (a) values (1);
+replace into t1 (a, b) values (2, 'b2x');
+replace into t1 (a, c) values (3, 'c3x');
+replace into t1 (a, b, c) values (5, 'b5x', 'c5x');
+replace into t1 (a) values (6);
+replace into t1 (a) values (7);
+select * from t1 order by a;
+a	b	c
+1	b	NULL
+2	b2x	NULL
+3	b	c3x
+5	b5x	c5x
+6	b	NULL
+7	b	NULL
+select * from t1 order by a;
+a	b	c
+1	b	NULL
+2	b2x	NULL
+3	b	c3x
+5	b5x	c5x
+6	b	NULL
+7	b	NULL
+drop table t1;
+create table t1 (a int primary key,
+b varchar(100) default 'b',
+c varchar(100),
+d text,
+e text) engine=ndbcluster;
+insert into t1 values (1, 'b1', 'c1', 'd1', 'e1');
+insert into t1 (a) values (2);
+insert into t1 (a, b, d) values (3, 'b3', 'd3');
+replace into t1 values (5, 'b5', 'c5', 'd5', 'e5');
+replace into t1 (a) values (6);
+replace into t1 (a, c, e) values (7, 'c7', 'e7');
+select * from t1 order by a;
+a	b	c	d	e
+1	b1	c1	d1	e1
+2	b	NULL	NULL	NULL
+3	b3	NULL	d3	NULL
+5	b5	c5	d5	e5
+6	b	NULL	NULL	NULL
+7	b	c7	NULL	e7
+select * from t1 order by a;
+a	b	c	d	e
+1	b1	c1	d1	e1
+2	b	NULL	NULL	NULL
+3	b3	NULL	d3	NULL
+5	b5	c5	d5	e5
+6	b	NULL	NULL	NULL
+7	b	c7	NULL	e7
+replace into t1 (a) values (1);
+replace into t1 (a, b, d) values (2, 'b2x', 'd2x');
+replace into t1 (a, c, e) values (3, 'c3x', 'e3x');
+replace into t1 (a, b, c, d, e) values (5, 'b5x', 'c5x', 'd5x', 'e5x');
+replace into t1 (a) values (6);
+replace into t1 (a, e) values (7, 'e7x');
+select * from t1 order by a;
+a	b	c	d	e
+1	b	NULL	NULL	NULL
+2	b2x	NULL	d2x	NULL
+3	b	c3x	NULL	e3x
+5	b5x	c5x	d5x	e5x
+6	b	NULL	NULL	NULL
+7	b	NULL	NULL	e7x
+select * from t1 order by a;
+a	b	c	d	e
+1	b	NULL	NULL	NULL
+2	b2x	NULL	d2x	NULL
+3	b	c3x	NULL	e3x
+5	b5x	c5x	d5x	e5x
+6	b	NULL	NULL	NULL
+7	b	NULL	NULL	e7x
+drop table t1;
diff -Nrup a/mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test
b/mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test	2008-04-04 11:54:15 +02:00
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test	2008-04-07 14:27:53 +02:00
@@ -258,36 +258,4 @@ SELECT c1 FROM t1 ORDER BY c1 LIMIT 5;
 --connection master
 DROP TABLE t1;
 
-# BUG#22045: Got error 839 'Illegal null attribute' from NDBCLUSTER when 'Replace Into'.
-# Check that REPLACE INTO replicates correctly with partial value list and no blobs.
-connection master;
-create table t1 (a int primary key,
-                 b varchar(100) default 'b',
-                 c varchar(100)) engine=ndbcluster;
-insert into t1 values (1, 'b1', 'c1');
-insert into t1 (a) values (2);
-insert into t1 (a, b) values (3, 'b3');
-replace into t1 values (5, 'b5', 'c5');
-replace into t1 (a) values (6);
-replace into t1 (a, c) values (7, 'c7');
-select * from t1 order by a;
-
---sync_slave_with_master
-select * from t1 order by a;
-
-connection master;
-replace into t1 (a) values (1);
-replace into t1 (a, b) values (2, 'b2x');
-replace into t1 (a, c) values (3, 'c3x');
-replace into t1 (a, b, c) values (5, 'b5x', 'c5x');
-replace into t1 (a) values (6);
-replace into t1 (a) values (7);
-select * from t1 order by a;
-
---sync_slave_with_master
-select * from t1 order by a;
-
---connection master
-drop table t1;
-
 -- source include/master-slave-end.inc
diff -Nrup a/mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test
b/mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test	2008-04-04 11:54:15 +02:00
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test	2008-04-07 14:27:53 +02:00
@@ -131,40 +131,6 @@ from t1 order by db, name;
 drop table t1;
 --sync_slave_with_master
 
-# BUG#22045: Got error 839 'Illegal null attribute' from NDBCLUSTER when 'Replace Into'.
-# Check that REPLACE INTO replicates correctly with partial value list and blobs.
-connection master;
-create table t1 (a int primary key,
-                 b varchar(100) default 'b',
-                 c varchar(100),
-                 d text,
-                 e text) engine=ndbcluster;
-insert into t1 values (1, 'b1', 'c1', 'd1', 'e1');
-insert into t1 (a) values (2);
-insert into t1 (a, b, d) values (3, 'b3', 'd3');
-replace into t1 values (5, 'b5', 'c5', 'd5', 'e5');
-replace into t1 (a) values (6);
-replace into t1 (a, c, e) values (7, 'c7', 'e7');
-select * from t1 order by a;
-
---sync_slave_with_master
-select * from t1 order by a;
-
-connection master;
-replace into t1 (a) values (1);
-replace into t1 (a, b, d) values (2, 'b2x', 'd2x');
-replace into t1 (a, c, e) values (3, 'c3x', 'e3x');
-replace into t1 (a, b, c, d, e) values (5, 'b5x', 'c5x', 'd5x', 'e5x');
-replace into t1 (a) values (6);
-replace into t1 (a, e) values (7, 'e7x');
-select * from t1 order by a;
-
---sync_slave_with_master
-select * from t1 order by a;
-
---connection master
-drop table t1;
-
 #
 # view the binlog - not deterministic (mats)
 #
diff -Nrup a/mysql-test/suite/rpl_ndb/t/rpl_ndb_bug22045.test
b/mysql-test/suite/rpl_ndb/t/rpl_ndb_bug22045.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_bug22045.test	2008-04-07 14:27:53 +02:00
@@ -0,0 +1,69 @@
+--source include/have_ndb.inc
+# Test case currently fails for statement-based replication, as BUG#22045 is
+# not fixed in the replication slave thread.
+--source include/have_binlog_format_mixed_or_row.inc
+--source include/ndb_master-slave.inc
+
+# BUG#22045: Got error 839 'Illegal null attribute' from NDBCLUSTER when 'Replace Into'.
+# Check that REPLACE INTO replicates correctly with partial value list and with/without
blobs.
+connection master;
+create table t1 (a int primary key,
+                 b varchar(100) default 'b',
+                 c varchar(100)) engine=ndbcluster;
+insert into t1 values (1, 'b1', 'c1');
+insert into t1 (a) values (2);
+insert into t1 (a, b) values (3, 'b3');
+replace into t1 values (5, 'b5', 'c5');
+replace into t1 (a) values (6);
+replace into t1 (a, c) values (7, 'c7');
+select * from t1 order by a;
+
+--sync_slave_with_master
+select * from t1 order by a;
+
+connection master;
+replace into t1 (a) values (1);
+replace into t1 (a, b) values (2, 'b2x');
+replace into t1 (a, c) values (3, 'c3x');
+replace into t1 (a, b, c) values (5, 'b5x', 'c5x');
+replace into t1 (a) values (6);
+replace into t1 (a) values (7);
+select * from t1 order by a;
+
+--sync_slave_with_master
+select * from t1 order by a;
+
+--connection master
+drop table t1;
+create table t1 (a int primary key,
+                 b varchar(100) default 'b',
+                 c varchar(100),
+                 d text,
+                 e text) engine=ndbcluster;
+insert into t1 values (1, 'b1', 'c1', 'd1', 'e1');
+insert into t1 (a) values (2);
+insert into t1 (a, b, d) values (3, 'b3', 'd3');
+replace into t1 values (5, 'b5', 'c5', 'd5', 'e5');
+replace into t1 (a) values (6);
+replace into t1 (a, c, e) values (7, 'c7', 'e7');
+select * from t1 order by a;
+
+--sync_slave_with_master
+select * from t1 order by a;
+
+connection master;
+replace into t1 (a) values (1);
+replace into t1 (a, b, d) values (2, 'b2x', 'd2x');
+replace into t1 (a, c, e) values (3, 'c3x', 'e3x');
+replace into t1 (a, b, c, d, e) values (5, 'b5x', 'c5x', 'd5x', 'e5x');
+replace into t1 (a) values (6);
+replace into t1 (a, e) values (7, 'e7x');
+select * from t1 order by a;
+
+--sync_slave_with_master
+select * from t1 order by a;
+
+--connection master
+drop table t1;
+
+-- source include/master-slave-end.inc