diff options
| author | Patrick Crews <patrick.crews@sun.com> | 2008-09-15 16:26:45 -0400 |
|---|---|---|
| committer | Patrick Crews <patrick.crews@sun.com> | 2008-09-15 16:26:45 -0400 |
| commit | f2ea573869cbea066db34a4e242812564e3104d5 (patch) | |
| tree | d5fa838d6be02935a169d9a70d7ac70fbca268bf | |
| parent | 26c48a80896acfb78340787fd4126504b29d6efc (diff) | |
| parent | ebd3a6e452c13510d13f82b8fe83850ae41f1b5c (diff) | |
| download | mariadb-git-f2ea573869cbea066db34a4e242812564e3104d5.tar.gz | |
Bug#37938 Test "mysqldump" lacks various INSERT statements / values
Merge of fixes from 5.0 -> 5.1
Moved restoration of concurrent_insert's original value to the end of the 5.1 tests
Re-recorded .result file to account for changes to test file.
| -rw-r--r-- | mysql-test/r/mysqldump.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/mysqldump.test | 13 |
2 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 3e0b4f80f84..1e76e85ce64 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -1,3 +1,8 @@ +Bug#37938 - Test "mysqldump" lacks various insert statements +Turn off concurrent inserts to avoid random errors +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; DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3; drop database if exists mysqldump_test_db; drop database if exists db1; @@ -4089,6 +4094,7 @@ DROP DATABASE mysqldump_test_db; # -- End of test case for Bug#32538. +SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT; # # End of 5.1 tests # diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 1792b11435c..8084457b92b 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 # |