diff options
| author | Mats Kindahl <mats@sun.com> | 2008-10-23 21:27:09 +0200 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2008-10-23 21:27:09 +0200 |
| commit | 32c161f3ea7314051090fb02eca03ef347394010 (patch) | |
| tree | 09212d65be943c6c5dfd6d6a834841683d81f9f8 /mysql-test/t/mysqldump.test | |
| parent | 3be6d967c5d04fa6dbeab1c25f28673d3abf8433 (diff) | |
| parent | e291aab7da9587f742291e7cc5e10e568846066e (diff) | |
| download | mariadb-git-32c161f3ea7314051090fb02eca03ef347394010.tar.gz | |
Merging 5.1 main into 5.1-rpl
Diffstat (limited to 'mysql-test/t/mysqldump.test')
| -rw-r--r-- | mysql-test/t/mysqldump.test | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 25cda449abf..de5abdd7c9d 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -5,6 +5,14 @@ # Binlog is required --source include/have_log_bin.inc + +--echo Bug#37938 - Test "mysqldump" lacks various insert statements +--echo Turn off concurrent inserts to avoid random errors +--echo NOTE: We reset the variable back to saved value at the end of test +SET @OLD_CONCURRENT_INSERT = @@GLOBAL.CONCURRENT_INSERT; +SET @@GLOBAL.CONCURRENT_INSERT = 0; + + --disable_warnings DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3; drop database if exists mysqldump_test_db; @@ -1593,6 +1601,7 @@ DROP TABLE t1,t2; --replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// / on [0-9 :-]+/ on DATE/ --exec $MYSQL_DUMP test + --echo # --echo # End of 5.0 tests --echo # @@ -1859,6 +1868,10 @@ DROP DATABASE mysqldump_test_db; --echo # -- End of test case for Bug#32538. --echo +# We reset concurrent_inserts value to whatever it was at the start of the test +SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT; + + ########################################################################### --echo # |