Commit 745e6498 authored by Marko Mäkelä's avatar Marko Mäkelä

After-merge fix to a test

parent 4ef2e430
...@@ -118,7 +118,7 @@ WHERE engine = 'innodb' ...@@ -118,7 +118,7 @@ WHERE engine = 'innodb'
AND support IN ('YES', 'DEFAULT', 'ENABLED'); AND support IN ('YES', 'DEFAULT', 'ENABLED');
COUNT(*) COUNT(*)
1 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 # Empty 10.2 redo log
SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES
WHERE engine = 'innodb' WHERE engine = 'innodb'
......
...@@ -118,7 +118,7 @@ WHERE engine = 'innodb' ...@@ -118,7 +118,7 @@ WHERE engine = 'innodb'
AND support IN ('YES', 'DEFAULT', 'ENABLED'); AND support IN ('YES', 'DEFAULT', 'ENABLED');
COUNT(*) COUNT(*)
1 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 # Empty 10.2 redo log
SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES
WHERE engine = 'innodb' WHERE engine = 'innodb'
......
...@@ -416,7 +416,11 @@ SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES ...@@ -416,7 +416,11 @@ SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES
WHERE engine = 'innodb' WHERE engine = 'innodb'
AND support IN ('YES', 'DEFAULT', 'ENABLED'); AND support IN ('YES', 'DEFAULT', 'ENABLED');
--source include/shutdown_mysqld.inc --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 --source include/search_pattern_in_file.inc
--echo # Empty 10.2 redo log --echo # Empty 10.2 redo log
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment