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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2019-09-06 17:16:40 +03:00
parent 780d2bb8a7 244f0e6dd8
commit 4081b7b27a
750 changed files with 13510 additions and 14412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/encryption/t/innodb_encrypt_log_corruption.opt
View File

@@ -3,3 +3,4 @@
--loose-file-key-management
--loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/logkey.txt
--file-key-management-encryption-algorithm=aes_cbc
--innodb-log-file-size=5242880

3
mysql-test/suite/encryption/t/tempfiles.test
View File

@@ -32,6 +32,7 @@ select sql_big_result t,count(t) from t1 group by t limit 10;
drop table t1;
reset master;
set @save_binlog_cache_size=@@global.binlog_cache_size;
set global binlog_cache_size=8192;
connect con1, localhost, root;
@@ -74,7 +75,7 @@ flush binary logs;
drop table t1, t2;
set global binlog_cache_size=default;
set @@global.binlog_cache_size=@save_binlog_cache_size;
let $MYSQLD_DATADIR= `select @@datadir`;
exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 | $MYSQL;