summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-10-12 13:29:49 -0700
committerunknown <jimw@mysql.com>2005-10-12 13:29:49 -0700
commit77ad01c270d7ae6ce27705a9fff1ab18cbd3f515 (patch)
treec1a1e6c9c15cf0b938aa43ad96f764f7a3f70f54
parent0c9997fca7dba2272b894e8f6947199e6ead0b8f (diff)
parent00ed42a30bd2584e56ce481c4d8193f90d0f8f95 (diff)
downloadmariadb-git-77ad01c270d7ae6ce27705a9fff1ab18cbd3f515.tar.gz
Merge mysql.com:/home/jimw/my/mysql-4.1-12136
into mysql.com:/home/jimw/my/mysql-4.1-clean
-rw-r--r--mysql-test/t/kill.test1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test
index fdedaa8cd7f..aada8dd2ef3 100644
--- a/mysql-test/t/kill.test
+++ b/mysql-test/t/kill.test
@@ -24,6 +24,7 @@ select ((@id := kill_id) - kill_id) from t1;
kill @id;
connection con1;
+--sleep 1
--disable_reconnect
# this statement should fail