database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

Browse Source 
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
This commit is contained in:
unknown
2006-02-07 22:10:44 +02:00
parent 79f6936d73 2408644096
commit acdf718959
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/kill.result
View File

@ -25,7 +25,7 @@ select ((@id := kill_id) - kill_id) from t3;
((@id := kill_id) - kill_id) ((@id := kill_id) - kill_id)
0 0
kill @id; kill @id;
ERROR 08S01: Server shutdown in progress Got one of the listed errors
drop table t1, t2, t3; drop table t1, t2, t3;
select get_lock("a", 10); select get_lock("a", 10);
get_lock("a", 10) get_lock("a", 10)

2
mysql-test/t/kill.test
View File

@ -84,7 +84,7 @@ select ((@id := kill_id) - kill_id) from t3;
kill @id; kill @id;
connection conn1; connection conn1;
-- error 1053 -- error 1053,2013
reap; reap;
connection default; connection default;