diff options
| author | unknown <bell@sanja.is.com.ua> | 2006-02-07 22:10:44 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2006-02-07 22:10:44 +0200 |
| commit | acdf71895964940fbc0c2b75d113dd8e66e96534 (patch) | |
| tree | be8164cad0e1ca5c7b92ff8691a209798ac7e570 /mysql-test/r/kill.result | |
| parent | 79f6936d738439d6e42da3ef89225fdaea318b54 (diff) | |
| parent | 2408644096a8d35976710bd66cad764fe3322915 (diff) | |
| download | mariadb-git-acdf71895964940fbc0c2b75d113dd8e66e96534.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
mysql-test/t/kill.test:
Auto merged
mysql-test/r/kill.result:
merge
Diffstat (limited to 'mysql-test/r/kill.result')
| -rw-r--r-- | mysql-test/r/kill.result | 2 |
1 files changed, 1 insertions, 1 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) |