diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-09 13:14:29 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-09 13:14:29 +0300 |
| commit | a88cb293923824d37e48d3dfc36b09d4c0ac5072 (patch) | |
| tree | 920e9296b28a45398f389e2b9d1263342645de6f /mysql-test/suite | |
| parent | 9ef12dceec1e4f7f1a76e306adbca89d69026560 (diff) | |
| parent | 0d9f6bccd3d633425a7861cbcb851596af8ac7e1 (diff) | |
| download | mariadb-git-a88cb293923824d37e48d3dfc36b09d4c0ac5072.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- mysql-test/suite/ndb/r/ndb_dd_ddl.result
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/ndb/r/ndb_dd_ddl.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/ndb/t/ndb_dd_ddl.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/ndb/r/ndb_dd_ddl.result b/mysql-test/suite/ndb/r/ndb_dd_ddl.result index 2ea073d87cd..35516efb48c 100644 --- a/mysql-test/suite/ndb/r/ndb_dd_ddl.result +++ b/mysql-test/suite/ndb/r/ndb_dd_ddl.result @@ -308,7 +308,7 @@ ENGINE = NDB; DROP USER mysqltest_u1@localhost; DROP USER mysqltest_u2@localhost; -DROP DATABASE IF EXISTS mysqltest2; +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 48d7b77c412..ca39be87c94 100644 --- a/mysql-test/suite/ndb/t/ndb_dd_ddl.test +++ b/mysql-test/suite/ndb/t/ndb_dd_ddl.test @@ -462,7 +462,7 @@ ENGINE = NDB; DROP USER mysqltest_u1@localhost; DROP USER mysqltest_u2@localhost; -DROP DATABASE IF EXISTS mysqltest2; +DROP DATABASE mysqltest2; --echo --echo # ----------------------------------------------------------------- |