From 745e6498eadc79bcaf08e822e47a83a0f1d74385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 18 Jan 2018 09:25:22 +0200 Subject: [PATCH] After-merge fix to a test --- .../suite/encryption/r/innodb_encrypt_log_corruption.result | 2 +- mysql-test/suite/innodb/r/log_corruption.result | 2 +- mysql-test/suite/innodb/t/log_corruption.test | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result b/mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result index 23e8a1c98c8..8b58ff593de 100644 --- a/mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result +++ b/mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result @@ -118,7 +118,7 @@ WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); COUNT(*) 1 -FOUND 1 /InnoDB: .* started; log sequence number 1213970/ in mysqld.1.err +FOUND 1 /InnoDB: .* started; log sequence number 121397[09]/ in mysqld.1.err # Empty 10.2 redo log SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' diff --git a/mysql-test/suite/innodb/r/log_corruption.result b/mysql-test/suite/innodb/r/log_corruption.result index b783a809a35..6bc10c970fc 100644 --- a/mysql-test/suite/innodb/r/log_corruption.result +++ b/mysql-test/suite/innodb/r/log_corruption.result @@ -118,7 +118,7 @@ WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); COUNT(*) 1 -FOUND 1 /InnoDB: .* started; log sequence number 1213970/ in mysqld.1.err +FOUND 1 /InnoDB: .* started; log sequence number 121397[09]/ in mysqld.1.err # Empty 10.2 redo log SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' diff --git a/mysql-test/suite/innodb/t/log_corruption.test b/mysql-test/suite/innodb/t/log_corruption.test index ca5d945afb7..e9b081cff76 100644 --- a/mysql-test/suite/innodb/t/log_corruption.test +++ b/mysql-test/suite/innodb/t/log_corruption.test @@ -416,7 +416,11 @@ SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); --source include/shutdown_mysqld.inc ---let SEARCH_PATTERN= InnoDB: .* started; log sequence number 1213970 +# In encryption.innodb_encrypt_log_corruption, we would convert the +# log to encrypted format. Writing an extra log checkpoint before the +# redo log conversion would advance the LSN by the size of a +# MLOG_CHECKPOINT record (9 bytes). +--let SEARCH_PATTERN= InnoDB: .* started; log sequence number 121397[09] --source include/search_pattern_in_file.inc --echo # Empty 10.2 redo log