diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-11 19:40:58 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-11 19:40:58 +0300 |
| commit | ebdef570e552b93b693398f42c229cf77ab85965 (patch) | |
| tree | ad3ff84791c35c7d8b2d47a60f0ea4cb409a0a31 /mysql-test/include | |
| parent | 567671368723c704d60902b4d0ccff951b414552 (diff) | |
| parent | 684c7aba09583e54c5272cc3b0eec207afc87a39 (diff) | |
| download | mariadb-git-ebdef570e552b93b693398f42c229cf77ab85965.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/kill_query.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/kill_query.inc b/mysql-test/include/kill_query.inc index 341c3b93535..b303ed0ec39 100644 --- a/mysql-test/include/kill_query.inc +++ b/mysql-test/include/kill_query.inc @@ -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; |