database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 5.0-bugteam to 5.1-bugteam.

Browse Source
This commit is contained in:
Sergey Vojtovich
2009-04-21 15:25:04 +05:00
parent 19fd076fb1 f8b219ee29
commit 626a720387
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/mysqldump.result
View File

@ -3815,7 +3815,6 @@ DROP TABLE t1,t2;
-- Dump completed on DATE -- Dump completed on DATE
SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
# #
# Bug #42635: mysqldump includes views that were excluded using # Bug #42635: mysqldump includes views that were excluded using
# the --ignore-table option # the --ignore-table option

5
mysql-test/t/mysqldump.test
View File

@ -1647,9 +1647,6 @@ DROP TABLE t1,t2;
--replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// / on [0-9 :-]+/ on DATE/ --replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// / on [0-9 :-]+/ on DATE/
--exec $MYSQL_DUMP test --exec $MYSQL_DUMP test
# We reset concurrent_inserts value to whatever it was at the start of the test
SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
--echo # --echo #
--echo # Bug #42635: mysqldump includes views that were excluded using --echo # Bug #42635: mysqldump includes views that were excluded using
--echo # the --ignore-table option --echo # the --ignore-table option
@ -1681,7 +1678,6 @@ CREATE TABLE `כדשגכחךלדגכחשךדגחכךלדגכ` ( f1 INT );
DROP TABLE `כדשגכחךלדגכחשךדגחכךלדגכ`; DROP TABLE `כדשגכחךלדגכחשךדגחכךלדגכ`;
SET NAMES latin1; SET NAMES latin1;
--echo # --echo #
--echo # End of 5.0 tests --echo # End of 5.0 tests
--echo # --echo #
@ -1954,6 +1950,7 @@ DROP DATABASE mysqldump_test_db;
--echo --echo
# We reset concurrent_inserts value to whatever it was at the start of the test # We reset concurrent_inserts value to whatever it was at the start of the test
# This line must be executed _after_ all test cases.
SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT; SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;