diff options
author | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-10-20 11:00:07 -0700 |
---|---|---|
committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-10-20 11:00:07 -0700 |
commit | 3f0d0d0633b121b2d615fe547bcd41518f49e810 (patch) | |
tree | b5d1038169ce7dc60fcd39fa7500908a66394ef9 /mysql-test/t/kill.test | |
parent | ead175bb07a9101488fa59794900f65e3186a88d (diff) | |
parent | 5ef63a4f1c2f1abb81caaec639b962837821000f (diff) | |
download | mariadb-git-3f0d0d0633b121b2d615fe547bcd41518f49e810.tar.gz |
manual merge of 28141
Diffstat (limited to 'mysql-test/t/kill.test')
-rw-r--r-- | mysql-test/t/kill.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test index 8ef668f542b..02b033df2e5 100644 --- a/mysql-test/t/kill.test +++ b/mysql-test/t/kill.test @@ -97,7 +97,7 @@ select ((@id := kill_id) - kill_id) from t3; kill @id; connection conn1; --- error 1053,2013 +-- error 1317,2013 reap; connection default; |