summaryrefslogtreecommitdiff
path: root/mysql-test/r/kill.result
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-04-04 23:03:56 -0700
committerunknown <jimw@mysql.com>2005-04-04 23:03:56 -0700
commit66e6808ed0b31f085eab4187fa835cb1168e8aa9 (patch)
tree6ad8acc6094f563caca17989c7e15c8f1d599987 /mysql-test/r/kill.result
parent2cb2374b78b8bab2655a3f45d9e4f657c2250336 (diff)
parent682baee2316f194108587ce0da4aa44ea1a481ab (diff)
downloadmariadb-git-66e6808ed0b31f085eab4187fa835cb1168e8aa9.tar.gz
Merge
mysql-test/r/join_outer.result: Auto merged mysql-test/t/join_outer.test: Auto merged sql-common/client.c: Auto merged sql/mysqld.cc: Auto merged
Diffstat (limited to 'mysql-test/r/kill.result')
-rw-r--r--mysql-test/r/kill.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result
index 2413834be4f..049281ad5d4 100644
--- a/mysql-test/r/kill.result
+++ b/mysql-test/r/kill.result
@@ -5,6 +5,8 @@ select ((@id := kill_id) - kill_id) from t1;
((@id := kill_id) - kill_id)
0
kill @id;
+select 1;
+ERROR HY000: MySQL server has gone away
select ((@id := kill_id) - kill_id) from t1;
((@id := kill_id) - kill_id)
0