Merge from mysql-5.1 -> mysql-5.5.

9c08717a · Nirbhay Choubey · c0613a9f · da70b67a · 9c08717a · 9c08717a
Commit 9c08717a authored Mar 17, 2011 by Nirbhay Choubey
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

mysql-test/r/mysqldump.result mysql-test/r/mysqldump.result +1 -0

mysql-test/t/mysqldump.test mysql-test/t/mysqldump.test +2 -0

No files found.
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -4626,6 +4626,7 @@ DELIMITER ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 ALTER DATABASE `test-database` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 DROP DATABASE `test-database`;
+USE `test`;
 #
 # End of 5.1 tests
 #

--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -2198,6 +2198,8 @@ ALTER DATABASE `test-database` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 --exec $MYSQL_DUMP --quote-names --compact test-database

 DROP DATABASE `test-database`;
+# Switching back to test database.
+USE `test`;

 --echo #
 --echo # End of 5.1 tests