database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.

Browse Source
This commit is contained in:
Alexey Kopytov
2009-12-11 19:40:58 +03:00
parent 5676713687 684c7aba09
commit ebdef570e5
56 changed files with 1925 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/kill_query.inc
View File

@ -52,7 +52,7 @@ if (`SELECT '$debug_lock' != ''`)
# reap the result of the waiting query
connection $connection_name;
error 0, 1317, 1307, 1306, 1334, 1305;
error 0, 1317, 1307, 1306, 1334, 1305, 1034;
reap;
connection master;