diff options
Diffstat (limited to 'mysql-test/r/kill.result')
| -rw-r--r-- | mysql-test/r/kill.result | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result index 6afce67cc1a..d40c4ee758c 100644 --- a/mysql-test/r/kill.result +++ b/mysql-test/r/kill.result @@ -1,3 +1,5 @@ +set local sql_mode=""; +set global sql_mode=""; SET DEBUG_SYNC = 'RESET'; DROP TABLE IF EXISTS t1, t2, t3; DROP FUNCTION IF EXISTS MY_KILL; @@ -24,7 +26,7 @@ SELECT 4; 4 4 KILL (SELECT COUNT(*) FROM mysql.user); -ERROR 42000: This version of MariaDB doesn't yet support 'Usage of subqueries or stored function calls as part of this statement' +ERROR 42000: KILL does not support subqueries or stored functions. SET DEBUG_SYNC= 'thread_end SIGNAL con1_end'; SET DEBUG_SYNC= 'before_do_command_net_read SIGNAL con1_read WAIT_FOR kill'; SET DEBUG_SYNC= 'now WAIT_FOR con1_read'; @@ -308,5 +310,18 @@ SLEEP(1000) 1 KILL QUERY ID 0; ERROR HY000: Unknown query id: 0 +# +# MDEV-5096 - Wrong error message on attempt to kill somebody else's +# query ID +# +CREATE USER u1@localhost; +SELECT SLEEP(1000); +KILL QUERY ID ID; +ERROR HY000: You are not owner of query ID +KILL QUERY ID @id; +SLEEP(1000) +1 +DROP USER u1@localhost; SET DEBUG_SYNC = 'RESET'; DROP FUNCTION MY_KILL; +set global sql_mode=default; |