Skip to content

M
MariaDB
Commit 9c08717a authored by Nirbhay Choubey's avatar Nirbhay Choubey
Browse files
Options

Merge from mysql-5.1 -> mysql-5.5.

parents c0613a9f da70b67a
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
mysql-test/r/mysqldump.result
View file @ 9c08717a
...@@ -4626,6 +4626,7 @@ DELIMITER ; ...@@ -4626,6 +4626,7 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET collation_connection = @saved_col_connection */ ;
ALTER DATABASE `test-database` CHARACTER SET utf8 COLLATE utf8_unicode_ci ; ALTER DATABASE `test-database` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
DROP DATABASE `test-database`; DROP DATABASE `test-database`;
USE `test`;
# #
# End of 5.1 tests # End of 5.1 tests
# #
......
mysql-test/t/mysqldump.test
View file @ 9c08717a
...@@ -2198,6 +2198,8 @@ ALTER DATABASE `test-database` CHARACTER SET utf8 COLLATE utf8_unicode_ci ; ...@@ -2198,6 +2198,8 @@ ALTER DATABASE `test-database` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
--exec $MYSQL_DUMP --quote-names --compact test-database --exec $MYSQL_DUMP --quote-names --compact test-database
DROP DATABASE `test-database`; DROP DATABASE `test-database`;
# Switching back to test database.
USE `test`;
--echo # --echo #
--echo # End of 5.1 tests --echo # End of 5.1 tests
......
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