diff options
| author | unknown <bell@sanja.is.com.ua> | 2006-02-08 10:36:42 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2006-02-08 10:36:42 +0200 |
| commit | 444f8869e2ba8c8d03f5d012051b010d7fa017b5 (patch) | |
| tree | cc32000c715dac2ab5ec925a7c6555b3483cdeb9 | |
| parent | 5b9cdaa4798872ff0eb6402a3819d4a36161a168 (diff) | |
| parent | acdf71895964940fbc0c2b75d113dd8e66e96534 (diff) | |
| download | mariadb-git-444f8869e2ba8c8d03f5d012051b010d7fa017b5.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
| -rw-r--r-- | mysql-test/r/kill.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/kill.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result index 2cb90679aed..e9d41c104dd 100644 --- a/mysql-test/r/kill.result +++ b/mysql-test/r/kill.result @@ -25,7 +25,7 @@ select ((@id := kill_id) - kill_id) from t3; ((@id := kill_id) - kill_id) 0 kill @id; -ERROR 08S01: Server shutdown in progress +Got one of the listed errors drop table t1, t2, t3; select get_lock("a", 10); get_lock("a", 10) diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test index 9a8f61b1052..8302c767985 100644 --- a/mysql-test/t/kill.test +++ b/mysql-test/t/kill.test @@ -84,7 +84,7 @@ select ((@id := kill_id) - kill_id) from t3; kill @id; connection conn1; --- error 1053 +-- error 1053,2013 reap; connection default; |