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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2019-08-16 14:35:32 +03:00
parent 6073049a36 c221bcdce7
commit 67ddb6507d
119 changed files with 2738 additions and 1304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/innodb/t/undo_truncate_recover.test
View File

@@ -34,6 +34,7 @@ update t1 set c = 'MariaDB';
update t1 set c = 'InnoDB';
eval set global debug_dbug = '+d,$SEARCH_PATTERN';
commit;
drop table t1;
call mtr.add_suppression("InnoDB: innodb_undo_tablespaces=0 disables dedicated undo log tablespaces");
SET GLOBAL innodb_fast_shutdown=0;
--source include/shutdown_mysqld.inc
@@ -50,5 +51,3 @@ if ($checksum_algorithm == "strict_crc32")
let $restart_parameters= $restart_parameters --innodb_checksum_algorithm=strict_full_crc32;
}
--source include/start_mysqld.inc
drop table t1;