From 836d4e74d9416a1af839f8068c5a07bee6f4b71e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Sat, 16 Sep 2017 16:55:16 +0300 Subject: Write proper tests for MDEV-12634: Uninitialised ROW_MERGE_RESERVE_SIZE bytes Introduce innodb_encrypt_log.combinations and prove that the encryption and decryption take place during both online ADD INDEX (WL#5266) and online table-rebuilding ALTER (WL#6625). --- mysql-test/include/innodb_encrypt_log.combinations | 7 +++++++ mysql-test/include/innodb_encrypt_log.inc | 4 ++++ 2 files changed, 11 insertions(+) create mode 100644 mysql-test/include/innodb_encrypt_log.combinations create mode 100644 mysql-test/include/innodb_encrypt_log.inc (limited to 'mysql-test/include') diff --git a/mysql-test/include/innodb_encrypt_log.combinations b/mysql-test/include/innodb_encrypt_log.combinations new file mode 100644 index 00000000000..fd21a57c3c2 --- /dev/null +++ b/mysql-test/include/innodb_encrypt_log.combinations @@ -0,0 +1,7 @@ +[crypt] +innodb_encrypt_log=ON +innodb_encryption_rotate_key_age=1 +plugin_load_add=$DEBUG_KEY_MANAGEMENT_SO + +[clear] +skip_innodb_encrypt_log diff --git a/mysql-test/include/innodb_encrypt_log.inc b/mysql-test/include/innodb_encrypt_log.inc new file mode 100644 index 00000000000..5beebeae81f --- /dev/null +++ b/mysql-test/include/innodb_encrypt_log.inc @@ -0,0 +1,4 @@ +# The goal of including this file is to enable innodb_encrypt_log combinations +# (see include/innodb_encrypt_log.combinations) + +--source include/have_innodb.inc -- cgit v1.2.1