diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-02-19 11:01:25 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-02-19 11:01:25 +0200 |
| commit | 945fa0d913a65c447306e945c44f50828903445b (patch) | |
| tree | 5178630451a60c8da965c19e0c339eb4f629de2f /mysql-test/include/wait_until_disconnected.inc | |
| parent | 8526274c21ce0fd7eedac5275cb210cd2b048dc5 (diff) | |
| parent | 6a1bc662d67cdb7716480654ddd63d504508b4fa (diff) | |
| download | mariadb-git-945fa0d913a65c447306e945c44f50828903445b.tar.gz | |
Merge with mysql-maria tree
mysql-test/t/variables.test:
Reset delay_key_write, otherwise maria.maria test may fail
sql/set_var.cc:
Reset ha_open_options if one resets the delay_key_write variable.
Before there was no way to reset it without restarting mysqld, which caused some tests to fail
Diffstat (limited to 'mysql-test/include/wait_until_disconnected.inc')
| -rw-r--r-- | mysql-test/include/wait_until_disconnected.inc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/include/wait_until_disconnected.inc b/mysql-test/include/wait_until_disconnected.inc index 4f7d5c49460..c274fbbe089 100644 --- a/mysql-test/include/wait_until_disconnected.inc +++ b/mysql-test/include/wait_until_disconnected.inc @@ -5,11 +5,14 @@ --disable_result_log --disable_query_log -let $counter= 500; +let $counter= 600; let $mysql_errno= 0; while (!$mysql_errno) { - --error 0,2002,2003,2006,1053 + # Strangely enough, the server might return "Too many connections" + # while being shutdown, thus 1040 is an "allowed" error. + # See BUG#36228. + --error 0,1040,1053,2002,2003,2006,2013 show status; dec $counter; @@ -17,7 +20,7 @@ while (!$mysql_errno) { --die Server failed to dissapear } - --sleep 0.1 + --real_sleep 0.1 } --enable_query_log --enable_result_log |