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.6 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2024-12-19 15:38:53 +02:00
parent c391fb1ff1 c982a143fc
commit a54d151fc1
129 changed files with 1398 additions and 1726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/innodb_rollback_on_timeout.inc
View File

@@ -2,6 +2,10 @@
# Bug #24200: Provide backwards compatibility mode for 4.x "rollback on
# transaction timeout"
#
--disable_query_log
call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
--enable_query_log
--disable_warnings
drop table if exists t1;
--enable_warnings