merge

mysql-test/r/ndb_blob.result

 drop table if exists t1;
-drop database if exists test2;
+drop database if exists mysqltest;
 create table t1 (
 a int not null primary key,
 b tinytext
@@ -276,8 +276,8 @@ a	b	c	d
 7	7xb7	777	7xdd7
 8	8xb8	888	8xdd8
 9	9xb9	999	9xdd9
-create database test2;
-use test2;
+create database mysqltest;
+use mysqltest;
 CREATE TABLE t2 (
 a bigint unsigned NOT NULL PRIMARY KEY,
 b int unsigned not null,

mysql-test/t/ndb_blob.test

@@ -118,7 +118,7 @@ from t1 where a=2;
 update t1 set d=null where a=1;
 commit;
 # FIXME now fails at random due to weird mixup between the 2 rows
-#select a from t1 where d is null;
+select a from t1 where d is null;
 
 # pk delete
 delete from t1 where a=1;