diff options
author | unknown <monty@mysql.com> | 2004-09-02 16:58:01 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-09-02 16:58:01 +0300 |
commit | a88ab457e32027cae8c7cf07e4b1be796468f9b0 (patch) | |
tree | 281d7c00080d7a9f2533661ce2da8fad25419530 /mysql-test/r/ndb_blob.result | |
parent | 3c3db07321d1a75a241e1d6689dc56d9415519a5 (diff) | |
parent | 762bee96d2be00d45d53cf9434383b325ce54f79 (diff) | |
download | mariadb-git-a88ab457e32027cae8c7cf07e4b1be796468f9b0.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
sql/sql_select.cc:
Auto merged
tests/client_test.c:
Auto merged
Diffstat (limited to 'mysql-test/r/ndb_blob.result')
-rw-r--r-- | mysql-test/r/ndb_blob.result | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/r/ndb_blob.result b/mysql-test/r/ndb_blob.result index 0e99c939ea7..c590815b233 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; set autocommit=0; create table t1 ( a int not null primary key, @@ -256,8 +256,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, @@ -320,3 +320,5 @@ rollback; select count(*) from t1; count(*) 0 +drop table t1; +drop database mysqltest; |