Skip to content

Commit 24d0c41

Browse files
committed
BUG#31417550 : INNODB.UNDO_ENCRYPT_CRASH.TEST MIGHT FAIL UNEXPECTEDLY
Issue: In test innodb.undo_encrypt_crash.test, when the new server is initialised with --no-defaults, further restart was being done without --no-defaults, because of which it was possible to pick local my.cnf causing unexpected behaviour. Fix: Fix the test to do server start with --no-defaults wherever required. Removed a suppression which wasn't needed. Reviewed by : Sunny Bains <[email protected]>
1 parent a701199 commit 24d0c41

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

mysql-test/suite/innodb/t/undo_encrypt_crash.test

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44

55
--source include/have_debug.inc
66

7-
--disable_query_log
8-
call mtr.add_suppression("\\[ERROR\\] .*MY-\\d+.* [InnoDB] Assertion failure: srv0start.cc");
9-
--enable_query_log
10-
117
--echo #########
128
--echo # SETUP #
139
--echo #########
@@ -57,7 +53,7 @@ let NEW_CMD = $MYSQLD --no-defaults --innodb_dedicated_server=OFF --initialize-i
5753
# - UNDO tablespace would have been encrypted with default master key
5854
# - Header page for UNDO tablespace wouldn't have been flushed
5955
# - So encryption information is still in REDO Log.
60-
let $NEW_CMD = $MYSQLD --innodb_dedicated_server=OFF --innodb_log_file_size=$LOG_FILE_SIZE --innodb_page_size=$START_PAGE_SIZE --innodb_data_home_dir=$MYSQLD_HOME_DATA_DIR --innodb_undo_directory=$MYSQLD_UNDO_DATADIR --basedir=$MYSQLD_BASEDIR --datadir=$MYSQLD_DATADIR --early-plugin-load=keyring_file=$KEYRING_PLUGIN --loose-keyring_file_data=$MYSQL_TMP_DIR/mysecret_keyring $KEYRING_PLUGIN_OPT --innodb_undo_log_encrypt=ON --debug=d,crash_before_purge_thread;
56+
let $NEW_CMD = $MYSQLD --no-defaults --innodb_dedicated_server=OFF --innodb_log_file_size=$LOG_FILE_SIZE --innodb_page_size=$START_PAGE_SIZE --innodb_data_home_dir=$MYSQLD_HOME_DATA_DIR --innodb_undo_directory=$MYSQLD_UNDO_DATADIR --basedir=$MYSQLD_BASEDIR --datadir=$MYSQLD_DATADIR --early-plugin-load=keyring_file=$KEYRING_PLUGIN --loose-keyring_file_data=$MYSQL_TMP_DIR/mysecret_keyring $KEYRING_PLUGIN_OPT --innodb_undo_log_encrypt=ON --debug=d,crash_before_purge_thread;
6157
--error 1,2,42,137
6258
--exec $NEW_CMD
6359

0 commit comments

Comments
 (0)