diff options
| author | acurtis@pcgem.rdg.cyberkinetica.com <> | 2004-11-10 16:05:58 +0000 |
|---|---|---|
| committer | acurtis@pcgem.rdg.cyberkinetica.com <> | 2004-11-10 16:05:58 +0000 |
| commit | 3eb817a821923e37b1269ff200e3f8edd9dbd077 (patch) | |
| tree | e93181a553099abf896916852eb0ce1c3f04e2e1 /mysql-test | |
| parent | 8f408a18ded23924314f1155926733990c61e42d (diff) | |
| parent | dd1cd8aa463b05375eeaca632b8d850a413a968a (diff) | |
| download | mariadb-git-3eb817a821923e37b1269ff200e3f8edd9dbd077.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6031
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ndb_basic.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/ndb_basic.test | 15 |
2 files changed, 22 insertions, 0 deletions
diff --git a/mysql-test/r/ndb_basic.result b/mysql-test/r/ndb_basic.result index ba8ee820ad9..6ec5338acbe 100644 --- a/mysql-test/r/ndb_basic.result +++ b/mysql-test/r/ndb_basic.result @@ -400,6 +400,13 @@ b attr1 9413 9412 drop table test.t1, t2; drop database mysqltest; +drop database if exists ndbtest1; +create database ndbtest1; +use ndbtest1; +create table t1(id int) engine=ndbcluster; +drop database ndbtest1; +drop database ndbtest1; +ERROR HY000: Can't drop database 'ndbtest1'; database doesn't exist use test; create table t1 (a int primary key, b char(0)); insert into t1 values (1,""); diff --git a/mysql-test/t/ndb_basic.test b/mysql-test/t/ndb_basic.test index b62d2a8e0e1..2671223ada8 100644 --- a/mysql-test/t/ndb_basic.test +++ b/mysql-test/t/ndb_basic.test @@ -361,6 +361,21 @@ drop table test.t1, t2; drop database mysqltest; # +# BUG#6031 - DROP DATABASE doesn't drop database on first try +# + +--disable_warnings +drop database if exists ndbtest1; +--enable_warnings + +create database ndbtest1; +use ndbtest1; +create table t1(id int) engine=ndbcluster; +drop database ndbtest1; +--error 1008 +drop database ndbtest1; + +# # test support of char(0) # |