Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge

mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test

@@ -973,14 +973,7 @@ SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
 --echo
 --echo ** update from master **
 connection master;
-#######################################
-# This test should be uncommented
-# once bug30674 is patched
-#######################################
-
-#***************************
-#UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
-#***************************
+UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
 
 --replace_column 5 CURRENT_TIMESTAMP
 SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;

mysql-test/suite/ndb/r/ndb_blob.result

@@ -568,3 +568,24 @@ select count(*) from t1;
 count(*)
 0
 drop table t1;
+create table t1(
+a int,
+blob_nn blob not null,
+text_nn text not null,
+blob_nl blob,
+text_nl text,
+primary key(a)
+) engine=ndb;
+insert into t1(a) values (1);
+Warnings:
+Warning	1364	Field 'blob_nn' doesn't have a default value
+Warning	1364	Field 'text_nn' doesn't have a default value
+insert into t1(a, text_nl) values (2, 'MySQL Cluster NDB');
+Warnings:
+Warning	1364	Field 'blob_nn' doesn't have a default value
+Warning	1364	Field 'text_nn' doesn't have a default value
+select a, length(blob_nn), length(text_nn), blob_nl, text_nl from t1 order by a;
+a	length(blob_nn)	length(text_nn)	blob_nl	text_nl
+1	0	0	NULL	NULL
+2	0	0	NULL	MySQL Cluster NDB
+drop table t1;

mysql-test/suite/ndb/t/ndb_blob.test

@@ -497,3 +497,23 @@ select count(*) from t1;
 drop table t1;
 
 # End of 4.1 tests
+
+
+# bug # 30674 :
+#   NOT NULL Blobs should default to zero-length.  Not NULL TEXT
+#   should default to zero-chars
+create table t1(
+  a int,
+  blob_nn blob not null,
+  text_nn text not null,
+  blob_nl blob,
+  text_nl text,
+  primary key(a)
+) engine=ndb;
+
+insert into t1(a) values (1);
+insert into t1(a, text_nl) values (2, 'MySQL Cluster NDB');
+
+select a, length(blob_nn), length(text_nn), blob_nl, text_nl from t1 order by a;
+
+drop table t1;

mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result

@@ -1089,18 +1089,19 @@ c1	hex(c4)	c5
 3	62316231623162316231623162316231	QA
 
 ** update from master **
+UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
 SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5	c6	c7
 1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
 2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
+3	62316231623162316231623162316231	TEST	3	CURRENT_TIMESTAMP
 
 ** Check slave **
 SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5
 1	62316231623162316231623162316231	Kyle
 2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
+3	62316231623162316231623162316231	TEST
 DROP TABLE t18;
 
 
@@ -2229,18 +2230,19 @@ c1	hex(c4)	c5
 3	62316231623162316231623162316231	QA
 
 ** update from master **
+UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
 SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5	c6	c7
 1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
 2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
+3	62316231623162316231623162316231	TEST	3	CURRENT_TIMESTAMP
 
 ** Check slave **
 SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5
 1	62316231623162316231623162316231	Kyle
 2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
+3	62316231623162316231623162316231	TEST
 DROP TABLE t18;
 
 
@@ -3369,18 +3371,19 @@ c1	hex(c4)	c5
 3	62316231623162316231623162316231	QA
 
 ** update from master **
+UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
 SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5	c6	c7
 1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
 2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
+3	62316231623162316231623162316231	TEST	3	CURRENT_TIMESTAMP
 
 ** Check slave **
 SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5
 1	62316231623162316231623162316231	Kyle
 2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
+3	62316231623162316231623162316231	TEST
 DROP TABLE t18;
 
 

mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result

@@ -1089,18 +1089,19 @@ c1	hex(c4)	c5
 3	62316231623162316231623162316231	QA
 
 ** update from master **
+UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
 SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5	c6	c7
 1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
 2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
+3	62316231623162316231623162316231	TEST	3	CURRENT_TIMESTAMP
 
 ** Check slave **
 SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5
 1	62316231623162316231623162316231	Kyle
 2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
+3	62316231623162316231623162316231	TEST
 DROP TABLE t18;
 
 
@@ -2229,18 +2230,19 @@ c1	hex(c4)	c5
 3	62316231623162316231623162316231	QA
 
 ** update from master **
+UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
 SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5	c6	c7
 1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
 2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
+3	62316231623162316231623162316231	TEST	3	CURRENT_TIMESTAMP
 
 ** Check slave **
 SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5
 1	62316231623162316231623162316231	Kyle
 2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
+3	62316231623162316231623162316231	TEST
 DROP TABLE t18;
 
 
@@ -3369,18 +3371,19 @@ c1	hex(c4)	c5
 3	62316231623162316231623162316231	QA
 
 ** update from master **
+UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
 SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5	c6	c7
 1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
 2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
+3	62316231623162316231623162316231	TEST	3	CURRENT_TIMESTAMP
 
 ** Check slave **
 SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5
 1	62316231623162316231623162316231	Kyle
 2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
+3	62316231623162316231623162316231	TEST
 DROP TABLE t18;
 
 

mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result

@@ -1089,18 +1089,19 @@ c1	hex(c4)	c5
 3	62316231623162316231623162316231	QA
 
 ** update from master **
+UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
 SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5	c6	c7
 1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
 2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
+3	62316231623162316231623162316231	TEST	3	CURRENT_TIMESTAMP
 
 ** Check slave **
 SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5
 1	62316231623162316231623162316231	Kyle
 2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
+3	62316231623162316231623162316231	TEST
 DROP TABLE t18;
 
 
@@ -2229,18 +2230,19 @@ c1	hex(c4)	c5
 3	62316231623162316231623162316231	QA
 
 ** update from master **
+UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
 SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5	c6	c7
 1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
 2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
+3	62316231623162316231623162316231	TEST	3	CURRENT_TIMESTAMP
 
 ** Check slave **
 SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5
 1	62316231623162316231623162316231	Kyle
 2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
+3	62316231623162316231623162316231	TEST
 DROP TABLE t18;