1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge 10.3 into 10.4

This commit is contained in:
Marko Mäkelä
2019-08-16 10:51:20 +03:00
24 changed files with 563 additions and 247 deletions

View File

@ -35,6 +35,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
@ -51,5 +52,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;