summaryrefslogtreecommitdiff
path: root/mysql-test/include/wait_until_connected_again.inc
diff options
context:
space:
mode:
authorunknown <guilhem@mysqlwin32.>2008-02-04 22:12:57 +0100
committerunknown <guilhem@mysqlwin32.>2008-02-04 22:12:57 +0100
commit0543c5f02817c0c97175c90fb629383824071ecd (patch)
tree9bc308b5b93e5fc34f023972e7a4c58ac713c5db /mysql-test/include/wait_until_connected_again.inc
parent4a1763e4287724421720e174f938d7303ad07c04 (diff)
downloadmariadb-git-0543c5f02817c0c97175c90fb629383824071ecd.tar.gz
Minor test fixes
mysql-test/include/wait_until_connected_again.inc: On Windows, mysqladmin does not wait on pid file when it has shut down mysqld. Thus, in maria_empty_logs.inc, wait_until_connected_again.inc can run while mysqld is shutting down (has not finished) and so get "shutdown in progress" instead of "can't connect". mysql-test/t/maria-recovery-big.test: it is a big test storage/maria/unittest/ma_test_recovery.pl: We want to see the result of 'cmp', like in the shell version
Diffstat (limited to 'mysql-test/include/wait_until_connected_again.inc')
-rw-r--r--mysql-test/include/wait_until_connected_again.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/wait_until_connected_again.inc b/mysql-test/include/wait_until_connected_again.inc
index 3d8a6212c34..02d544cb966 100644
--- a/mysql-test/include/wait_until_connected_again.inc
+++ b/mysql-test/include/wait_until_connected_again.inc
@@ -8,7 +8,7 @@ let $counter= 5000;
let $mysql_errno= 1;
while ($mysql_errno)
{
- --error 0,2002,2003,2006
+ --error 0,2002,2003,2006,1053
show status;
dec $counter;