summaryrefslogtreecommitdiff
path: root/mysql-test/t/kill.test
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2006-03-06 20:53:14 +0100
committerunknown <serg@serg.mylan>2006-03-06 20:53:14 +0100
commitcf4c785c62d1766ec46adc34a9989f87d94a8ab5 (patch)
treebe967a8a7ba4f723af3eb67a78cfbf5469cfdc8b /mysql-test/t/kill.test
parentc37f55e64caf6c6920adef09f5fffbf577ac885f (diff)
parent19a1f488a8bfc5b223c86dc64dffc247b31b9ddf (diff)
downloadmariadb-git-cf4c785c62d1766ec46adc34a9989f87d94a8ab5.tar.gz
merged
mysql-test/t/kill.test: Auto merged
Diffstat (limited to 'mysql-test/t/kill.test')
-rw-r--r--mysql-test/t/kill.test6
1 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test
index 8302c767985..eaeb174248b 100644
--- a/mysql-test/t/kill.test
+++ b/mysql-test/t/kill.test
@@ -46,8 +46,12 @@ select @id != connection_id();
connection con2;
select 4;
drop table t1;
-
connection default;
+disconnect con2;
+
+--error 1064
+kill (select count(*) from mysql.user);
+
#
# BUG#14851: killing long running subquery processed via a temporary table.
#