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

Merge 10.11 into 11.4

Browse Source
This commit is contained in:
Marko Mäkelä
2025-01-09 07:58:08 +02:00
parent 437550b7cf 28b2958082
commit 17f01186f5
473 changed files with 4731 additions and 3149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/rpl/t/rpl_parallel_optimistic.test
View File

@@ -7,6 +7,9 @@
call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
call mtr.add_suppression("Can't find record in 't1'");
call mtr.add_suppression("Can't find record in 't2'");
--disable_query_log
call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
--enable_query_log
--connection server_1
ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;