diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-02-15 12:58:34 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-02-15 12:58:34 +0200 |
| commit | a8fdaa6f2c5b2e302bffb069be3475772ca20f48 (patch) | |
| tree | b5c9560ec7346f7af6a5904ad344fdbb8020849c /mysql-test/include/wait_until_disconnected.inc | |
| parent | 115efe100dbc1393bce964fa1370e50cfef71d18 (diff) | |
| parent | f7a24d72dc7a86341da4634f6d1a71f1ea77000b (diff) | |
| download | mariadb-git-a8fdaa6f2c5b2e302bffb069be3475772ca20f48.tar.gz | |
Merge with base MySQL 5.1
Contains fixes for test cases
Changed release tag to beta
configure.in:
change release tag to beta
Diffstat (limited to 'mysql-test/include/wait_until_disconnected.inc')
| -rw-r--r-- | mysql-test/include/wait_until_disconnected.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/include/wait_until_disconnected.inc b/mysql-test/include/wait_until_disconnected.inc index cf4a574573f..4f7d5c49460 100644 --- a/mysql-test/include/wait_until_disconnected.inc +++ b/mysql-test/include/wait_until_disconnected.inc @@ -1,4 +1,3 @@ -# # Include this script after a shutdown to wait until the connection # to the server has been lost or timeout occurs. # When you change this file you may have to chance its cousin @@ -6,7 +5,7 @@ --disable_result_log --disable_query_log -let $counter= 5000; +let $counter= 500; let $mysql_errno= 0; while (!$mysql_errno) { @@ -16,7 +15,7 @@ while (!$mysql_errno) dec $counter; if (!$counter) { - --die Server failed to disconnect me + --die Server failed to dissapear } --sleep 0.1 } |