diff options
author | unknown <konstantin@mysql.com> | 2006-02-03 00:07:36 +0300 |
---|---|---|
committer | unknown <konstantin@mysql.com> | 2006-02-03 00:07:36 +0300 |
commit | 2fb59bd72a89fae62a15623b7b2e6ae8aea40927 (patch) | |
tree | 6912fbadce7df138637af6d72928935fc99c87f7 /mysql-test/r/kill.result | |
parent | cf4b6ee4c01ca9e002511ad221872b4182b910fa (diff) | |
download | mariadb-git-2fb59bd72a89fae62a15623b7b2e6ae8aea40927.tar.gz |
Post-merge fixes.
Diffstat (limited to 'mysql-test/r/kill.result')
-rw-r--r-- | mysql-test/r/kill.result | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result index d52d2eb9ebb..2cb90679aed 100644 --- a/mysql-test/r/kill.result +++ b/mysql-test/r/kill.result @@ -15,18 +15,6 @@ select 4; 4 4 drop table t1; -select get_lock("a", 10); -get_lock("a", 10) -1 - select get_lock("a", 10); -get_lock("a", 10) -NULL -select 1; -1 -1 -select RELEASE_LOCK("a"); -RELEASE_LOCK("a") -1 create table t1 (id int primary key); create table t2 (id int unsigned not null); insert into t2 select id from t1; @@ -39,3 +27,15 @@ select ((@id := kill_id) - kill_id) from t3; kill @id; ERROR 08S01: Server shutdown in progress drop table t1, t2, t3; +select get_lock("a", 10); +get_lock("a", 10) +1 + select get_lock("a", 10); +get_lock("a", 10) +NULL +select 1; +1 +1 +select RELEASE_LOCK("a"); +RELEASE_LOCK("a") +1 |