1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Manual merge from mysql-trunk.

Browse Source 
Conflicts:
  - mysql-test/suite/ndb/r/ndb_dd_ddl.result
This commit is contained in:
Alexander Nozdrin 2010-02-09 13:14:29 +03:00
commit a88cb29392
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/ndb/r/ndb_dd_ddl.result
View File

@ -308,7 +308,7 @@ ENGINE = NDB;
DROP USER mysqltest_u1@localhost; DROP USER mysqltest_u1@localhost;
DROP USER mysqltest_u2@localhost; DROP USER mysqltest_u2@localhost;
DROP DATABASE IF EXISTS mysqltest2; DROP DATABASE mysqltest2;
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# End 6.0 test # End 6.0 test

2
mysql-test/suite/ndb/t/ndb_dd_ddl.test
View File

@ -462,7 +462,7 @@ ENGINE = NDB;
DROP USER mysqltest_u1@localhost; DROP USER mysqltest_u1@localhost;
DROP USER mysqltest_u2@localhost; DROP USER mysqltest_u2@localhost;
DROP DATABASE IF EXISTS mysqltest2; DROP DATABASE mysqltest2;
--echo --echo
--echo # ----------------------------------------------------------------- --echo # -----------------------------------------------------------------