Skip to content

M
MariaDB
Commit a88cb293 authored by Alexander Nozdrin's avatar Alexander Nozdrin
Browse files
Options

Manual merge from mysql-trunk. 

Conflicts:
  - mysql-test/suite/ndb/r/ndb_dd_ddl.result
parents 9ef12dce 0d9f6bcc
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
mysql-test/suite/ndb/r/ndb_dd_ddl.result
View file @ a88cb293
......@@ -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
......
mysql-test/suite/ndb/t/ndb_dd_ddl.test
View file @ a88cb293
......@@ -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 # -----------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7