database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2020-11-01 14:26:15 +01:00
parent b0ff791618 80c951ce28
commit 8e1e2856f2
61 changed files with 1124 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/kill.test
View File

@ -606,6 +606,7 @@ let $wait_condition= SELECT @id:=QUERY_ID FROM INFORMATION_SCHEMA.PROCESSLIST WH
source include/wait_condition.inc;
KILL QUERY ID @id;
connection default;
--error ER_QUERY_INTERRUPTED
reap;
--error ER_NO_SUCH_QUERY
@ -632,6 +633,7 @@ connection con1;
KILL QUERY ID @id;
connection default;
--error ER_QUERY_INTERRUPTED
reap;
disconnect con5;
DROP USER u1@localhost;