database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Sergei Golubchik
2022-10-02 14:38:13 +02:00
parent e29fb95614 d4f6d2f08f
commit 3a2116241b
244 changed files with 9703 additions and 2438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,6 +217,7 @@ drop table t2;
--echo #
--echo # Test kill USER
--echo #
--source include/count_sessions.inc
grant ALL on test.* to test@localhost;
grant ALL on test.* to test2@localhost;
connect (con3, localhost, test,,);
@ -241,6 +242,7 @@ connection con4;
--error 2013,2006,5014
select 1;
connection default;
--source include/wait_until_count_sessions.inc
--echo #
--echo # MDEV-4911 - add KILL query id, and add query id information to