diff options
author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-03-24 23:44:38 +0300 |
---|---|---|
committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-03-24 23:44:38 +0300 |
commit | 808a99e9cf8c5a6a3b9e6a530b71182a92888c22 (patch) | |
tree | df804904d2700c325ef7b21412ebdafcd0c529af /mysql-test/include | |
parent | 326cb98b0c4701035546d4db0555cbc52a083013 (diff) | |
download | mariadb-git-808a99e9cf8c5a6a3b9e6a530b71182a92888c22.tar.gz |
Fix for bug #43801: mysql.test takes too long, fails due to
expired timeout on debx86-b in PB
Moved the resource-intensive test case for bug #41486 into
a separate test file to reduce execution time for mysql.test.
mysql-test/include/wait_until_disconnected.inc:
Used in mysql-bug41486.test.
mysql-test/r/mysql-bug41486.result:
Moved the resource-intensive test case for bug #41486 into
a separate test file to reduce execution time for mysql.test.
mysql-test/r/mysql.result:
Moved the resource-intensive test case for bug #41486 into
a separate test file to reduce execution time for mysql.test.
mysql-test/t/mysql-bug41486.test:
Moved the resource-intensive test case for bug #41486 into
a separate test file to reduce execution time for mysql.test.
mysql-test/t/mysql.test:
Moved the resource-intensive test case for bug #41486 into
a separate test file to reduce execution time for mysql.test.
Diffstat (limited to 'mysql-test/include')
-rw-r--r-- | mysql-test/include/wait_until_disconnected.inc | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/include/wait_until_disconnected.inc b/mysql-test/include/wait_until_disconnected.inc new file mode 100644 index 00000000000..a4362e52d01 --- /dev/null +++ b/mysql-test/include/wait_until_disconnected.inc @@ -0,0 +1,21 @@ +# +# Include this script to wait until the connection to the +# server has been dropped +--disable_result_log +--disable_query_log +let $counter= 500; +let $mysql_errno= 0; +while (!$mysql_errno) +{ + --error 0,1053,2002,2006,2013 + show status; + + dec $counter; + if (!$counter) + { + --die Server failed to dissapear + } + --sleep 0.1 +} +--enable_query_log +--enable_result_log |