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

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2019-07-02 21:44:58 +03:00
parent faeaf978b8 1d45b3b055
commit 7a3d34d645
323 changed files with 23262 additions and 8057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/encryption/t/innodb-encryption-alter.test
View File

@ -123,6 +123,8 @@ SET DEBUG_SYNC = 'now WAIT_FOR done';
SET GLOBAL innodb_flush_log_at_trx_commit=1;
COMMIT;
let $restart_parameters = --innodb_encryption_threads=2;
let $restart_noprint = 2;
--let $shutdown_timeout= 0
--source include/restart_mysqld.inc
disconnect con1;