diff options
| author | unknown <joreland@mysql.com> | 2004-09-06 10:05:55 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-09-06 10:05:55 +0200 |
| commit | a52636a0a4a72ede650ecb7913fe6b801a07397d (patch) | |
| tree | c879fc3d01d9a4461d524101c2e59619fa6bbc8b | |
| parent | fd07116e2f705ab5e54b614eba9f32cf10b8b0f1 (diff) | |
| download | mariadb-git-a52636a0a4a72ede650ecb7913fe6b801a07397d.tar.gz | |
merge
| -rw-r--r-- | mysql-test/r/ndb_blob.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/ndb_blob.test | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/ndb_blob.result b/mysql-test/r/ndb_blob.result index 4244c05e446..45b003e6967 100644 --- a/mysql-test/r/ndb_blob.result +++ b/mysql-test/r/ndb_blob.result @@ -1,5 +1,5 @@ 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, diff --git a/mysql-test/t/ndb_blob.test b/mysql-test/t/ndb_blob.test index 0df13eefe10..e5a9f7446d4 100644 --- a/mysql-test/t/ndb_blob.test +++ b/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; |