WL#9290 InnoDB: Support Transparent Data Encryption for Redo Log

Followup patch for fixing test case failure of log_encrypt_kill and log_encrypt2.
dutow · Jan 6, 2017 · 8facbb0 · 8facbb0
1 parent c6b5bd7
commit 8facbb0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/mysql-test/suite/innodb/r/log_encrypt_2.result b/mysql-test/suite/innodb/r/log_encrypt_2.result
@@ -1,4 +1,3 @@
-SET @@global.keyring_file_data="MYSQL_TMP_DIR/mysecret_keyring2";
 CREATE TABLE t1(c1 int) ENGINE=InnoDB ENCRYPTION="Y";
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;

diff --git a/mysql-test/suite/innodb/t/log_encrypt_2.test b/mysql-test/suite/innodb/t/log_encrypt_2.test
@@ -17,13 +17,10 @@ call mtr.add_suppression("\\[ERROR\\] InnoDB: Can't set redo log tablespace to b
 call mtr.add_suppression("You need to use --log-bin to make --binlog-format work");
 --enable_query_log
 
---replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
-eval SET @@global.keyring_file_data="$MYSQL_TMP_DIR/mysecret_keyring2";
+--sleep 2
 
 CREATE TABLE t1(c1 int) ENGINE=InnoDB ENCRYPTION="Y";
 
---sleep 1
-
 DROP TABLE t1;
 
 # Restart the server with keyring loaded

diff --git a/mysql-test/suite/innodb/t/log_encrypt_kill.test b/mysql-test/suite/innodb/t/log_encrypt_kill.test
@@ -24,6 +24,7 @@ call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files.");
 call mtr.add_suppression("InnoDB: New log files created, LSN=");
 call mtr.add_suppression("InnoDB: Can't set redo log tablespace to be encrypted");
 call mtr.add_suppression("InnoDB: Can't set undo log tablespace to be encrypted");
+call mtr.add_suppression("Error in Log_event::read_log_event()");
 --enable_query_log
 
 let $old_innodb_file_per_table = `SELECT @@innodb_file_per_table`;