database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch '11.1' into 11.2

Browse Source
This commit is contained in:
Yuchen Pei
2023-10-27 18:11:56 +11:00
parent a05b5dd505 9b2a65e41a
commit d0f8dfbcf0
504 changed files with 15082 additions and 28987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/main/delayed.test
View File

@ -408,6 +408,9 @@ DROP TABLE t2;
DROP TABLE t1;
# The following test is disabled as it fails randomly
if (0)
{
--echo #
--echo # Bug#54332 Deadlock with two connections doing LOCK TABLE+INSERT DELAYED
--echo #
@ -566,6 +569,7 @@ connection default;
DROP TABLE t1, t2, t3;
--enable_ps_protocol
--enable_view_protocol
}
--echo #
--echo # Test for bug #56251 "Deadlock with INSERT DELAYED and MERGE tables".