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

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-08-01 15:08:52 +02:00
parent 72928e640e 65405308a1
commit 6bf8483cac
827 changed files with 11530 additions and 5879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/handler/handler.inc
View File

@@ -896,6 +896,7 @@ drop table t1;
--echo # If we have to wait on an exclusive locks while having
--echo # an open HANDLER, ER_LOCK_DEADLOCK is reported.
--echo #
--disable_ps2_protocol
create table t1 (a int, key a(a));
handler t1 open;
connection con1;
@@ -915,6 +916,7 @@ select release_lock('lock1');
connection default;
reap;
select release_lock('lock1');
--enable_ps2_protocol
--echo # Demonstrate that there is no deadlock with FLUSH TABLE,
--echo # even though it is waiting for the other table to go away