database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

After-merge fix to a test

Browse Source
This commit is contained in:
Marko Mäkelä
2018-01-18 09:25:22 +02:00
parent 4ef2e43080
commit 745e6498ea
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result
View File

@ -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'

2
mysql-test/suite/innodb/r/log_corruption.result
View File

@ -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'

6
mysql-test/suite/innodb/t/log_corruption.test
View File

@ -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