summaryrefslogtreecommitdiff
path: root/mysql-test/r/kill.result
diff options
context:
space:
mode:
authorandrey@example.com <>2006-11-02 13:51:43 +0100
committerandrey@example.com <>2006-11-02 13:51:43 +0100
commitc27a88ca2dc3c817a21b2e7b07b8ed81db8cb2f9 (patch)
tree056ba4c6947c1fef6b27bd39ac904fd5a048b79f /mysql-test/r/kill.result
parentcf99db484ebae7a9b18bc21388b134281d13e981 (diff)
downloadmariadb-git-c27a88ca2dc3c817a21b2e7b07b8ed81db8cb2f9.tar.gz
Better fix for bug#22830
Events: crash with procedure which alters events with function Post-review CS This fix also changes the handling of KILL command combined with subquery. It changes the error message given back to "not supported", from parse error. The error for CREATE|ALTER EVENT has also been changed to generate "not supported yet" instead of parse error. In case of a SP call, the error is "not supported yet". This change cleans the parser from code which should not belong to there. Still LEX::expr_allows_subselect is existant because it simplifies the handling of SQLCOM_HA_READ which forbids subselects.
Diffstat (limited to 'mysql-test/r/kill.result')
-rw-r--r--mysql-test/r/kill.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result
index b78c677fb02..1795457220b 100644
--- a/mysql-test/r/kill.result
+++ b/mysql-test/r/kill.result
@@ -16,7 +16,7 @@ select 4;
4
drop table t1;
kill (select count(*) from mysql.user);
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select count(*) from mysql.user)' at line 1
+ERROR 42000: This version of MySQL doesn't yet support 'Usage of subqueries or stored function calls as part of this statement'
create table t1 (id int primary key);
create table t2 (id int unsigned not null);
insert into t2 select id from t1;