diff options
| author | Monty <monty@mariadb.org> | 2019-09-02 14:06:56 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-09-03 13:17:32 +0300 |
| commit | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch) | |
| tree | b592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/suite/encryption | |
| parent | b0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff) | |
| parent | 9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff) | |
| download | mariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/suite/encryption')
| -rw-r--r-- | mysql-test/suite/encryption/my.cnf | 1 | ||||
| -rw-r--r-- | mysql-test/suite/encryption/r/tempfiles.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/encryption/t/innodb_encrypt_log_corruption.opt | 1 | ||||
| -rw-r--r-- | mysql-test/suite/encryption/t/tempfiles.test | 3 |
4 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/suite/encryption/my.cnf b/mysql-test/suite/encryption/my.cnf new file mode 100644 index 00000000000..772daa0f545 --- /dev/null +++ b/mysql-test/suite/encryption/my.cnf @@ -0,0 +1 @@ +!include include/default_my.cnf diff --git a/mysql-test/suite/encryption/r/tempfiles.result b/mysql-test/suite/encryption/r/tempfiles.result index 45d9d379473..1c3172a185b 100644 --- a/mysql-test/suite/encryption/r/tempfiles.result +++ b/mysql-test/suite/encryption/r/tempfiles.result @@ -29,6 +29,7 @@ i 10 j 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; create table t1 (a text) engine=innodb; @@ -52,7 +53,7 @@ disconnect con2; connection default; flush binary logs; drop table t1, t2; -set global binlog_cache_size=default; +set @@global.binlog_cache_size=@save_binlog_cache_size; select left(a, 10) from t1; left(a, 10) 1111111111 diff --git a/mysql-test/suite/encryption/t/innodb_encrypt_log_corruption.opt b/mysql-test/suite/encryption/t/innodb_encrypt_log_corruption.opt index 8070b5a6182..ae20d676be3 100644 --- a/mysql-test/suite/encryption/t/innodb_encrypt_log_corruption.opt +++ b/mysql-test/suite/encryption/t/innodb_encrypt_log_corruption.opt @@ -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 diff --git a/mysql-test/suite/encryption/t/tempfiles.test b/mysql-test/suite/encryption/t/tempfiles.test index e2fd356bb82..74d03f5a448 100644 --- a/mysql-test/suite/encryption/t/tempfiles.test +++ b/mysql-test/suite/encryption/t/tempfiles.test @@ -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; |