diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-12-10 11:51:42 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-12-10 11:51:42 +0800 |
| commit | f8d16332515b08bf4f5e4a8274254a061295a712 (patch) | |
| tree | b5f7ecfd0110b7bfe6584dd4595c0588fed53197 /mysql-test/include | |
| parent | 2573ba24894f03daf7117fe2b85ae3ed4abfb3e1 (diff) | |
| parent | 91689490478f3d8a2fc6280b57d3a922f5e357f5 (diff) | |
| download | mariadb-git-f8d16332515b08bf4f5e4a8274254a061295a712.tar.gz | |
Merge from 5.0-bugteam
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; |