diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-09 14:04:56 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-09 14:04:56 +0300 |
| commit | f5311bba7e1847210d365bc476d2973dd39da3bd (patch) | |
| tree | e15da54b04e2707c338780f9d0ae5a9242942d37 /mysql-test | |
| parent | eb713160900bedcaf8b6751870ab73229699fe0a (diff) | |
| parent | 06ce01bace01d64dc62d5cb1ebf1345335efa8ff (diff) | |
| download | mariadb-git-f5311bba7e1847210d365bc476d2973dd39da3bd.tar.gz | |
Auto-merge from mysql-trunk.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/ndb/r/ndb_dd_ddl.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/ndb/t/ndb_dd_ddl.test | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite/ndb/r/ndb_dd_ddl.result b/mysql-test/suite/ndb/r/ndb_dd_ddl.result index 9714a89c2ab..35516efb48c 100644 --- a/mysql-test/suite/ndb/r/ndb_dd_ddl.result +++ b/mysql-test/suite/ndb/r/ndb_dd_ddl.result @@ -308,6 +308,7 @@ ENGINE = NDB; DROP USER mysqltest_u1@localhost; DROP USER mysqltest_u2@localhost; +DROP DATABASE mysqltest2; # ----------------------------------------------------------------- # End 6.0 test diff --git a/mysql-test/suite/ndb/t/ndb_dd_ddl.test b/mysql-test/suite/ndb/t/ndb_dd_ddl.test index e8db0730687..679c07ff0e3 100644 --- a/mysql-test/suite/ndb/t/ndb_dd_ddl.test +++ b/mysql-test/suite/ndb/t/ndb_dd_ddl.test @@ -463,6 +463,8 @@ ENGINE = NDB; DROP USER mysqltest_u1@localhost; DROP USER mysqltest_u2@localhost; +DROP DATABASE mysqltest2; + --echo --echo # ----------------------------------------------------------------- --echo # End 6.0 test |