database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-08 17:02:21 +03:00
Code Activity

BUG#36966 - mysqldump.test fails in pushbuild

Browse Source 
mysqldump.test is designed to run with concurrent inserts
disabled. It is disabling concurrent inserts at the very
beginning of the test case, and re-enables them at the
bottom of the test. But for some reason (likely incorrect
merge) we enable concurrent inserts in the middle of the test.

The problem is fixed by enabling concurrent inserts only
at the bottom of the test case.
This commit is contained in:
Sergey Vojtovich
2009-04-21 14:01:13 +05:00
parent 0804479569
commit f8b219ee29
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3557,7 +3557,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
@ -3693,6 +3692,7 @@ UNLOCK TABLES;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
DROP TABLE `כדשגכחךלדגכחשךדגחכךלדגכ`; DROP TABLE `כדשגכחךלדגכחשךדגחכךלדגכ`;
SET NAMES latin1; SET NAMES latin1;
SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
# #
# End of 5.0 tests # End of 5.0 tests
# #

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

@ -1646,9 +1646,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,6 +1678,9 @@ CREATE TABLE `כדשגכחךלדגכחשךדגחכךלדגכ` ( f1 INT );
DROP TABLE `כדשגכחךלדגכחשךדגחכךלדגכ`; DROP TABLE `כדשגכחךלדגכחשךדגחכךלדגכ`;
SET NAMES latin1; SET NAMES latin1;
# 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;
--echo # --echo #
--echo # End of 5.0 tests --echo # End of 5.0 tests