diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-12-10 13:05:06 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-12-10 13:05:06 +0200 |
| commit | ccdf5711a8fff0cd610a91fdcf37c8ff1182878c (patch) | |
| tree | 730ab29cd38d5b1ba747a1220f07550698ca03f2 | |
| parent | 978116d99125d6577b5333457585a4c6d0678427 (diff) | |
| parent | 979b23d5bfb11bb698ea65c9468b374978737ec0 (diff) | |
| download | mariadb-git-ccdf5711a8fff0cd610a91fdcf37c8ff1182878c.tar.gz | |
Merge 10.7 into 10.8
| -rw-r--r-- | mysql-test/suite/innodb/t/log_corruption.test | 2 | ||||
| -rw-r--r-- | storage/innobase/log/log0recv.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/suite/innodb/t/log_corruption.test b/mysql-test/suite/innodb/t/log_corruption.test index b9162be99db..4e9ea9fa698 100644 --- a/mysql-test/suite/innodb/t/log_corruption.test +++ b/mysql-test/suite/innodb/t/log_corruption.test @@ -16,7 +16,7 @@ call mtr.add_suppression("InnoDB: Log scan aborted at LSN"); call mtr.add_suppression("InnoDB: Missing MLOG_FILE_NAME or MLOG_FILE_DELETE before MLOG_CHECKPOINT for tablespace 42\\r?$"); call mtr.add_suppression("InnoDB: Obtaining redo log encryption key version 1 failed"); call mtr.add_suppression("InnoDB: Decrypting checkpoint failed"); -call mtr.add_suppression("InnoDB: Are you sure you are using the right ib_logfile0 to start up the database\\? Log sequence number in the ib_logfile0 is 1213964,"); +call mtr.add_suppression("InnoDB: Are you sure you are using the right ib_logfile0 to start up the database\\? The checkpoint is 1213964,"); call mtr.add_suppression("InnoDB: Log file .*ib_logfile1 is of different size 1048576 bytes than other log files 2097152 bytes!"); --enable_query_log diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc index 6c4ad0d3c58..920b9a45570 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -4029,8 +4029,9 @@ completed: " the right ib_logfile0" " to start up the database?" " The checkpoint is " LSN_PF - ", less than the log sequence number" - LSN_PF " in the system tablespace.", + ", less than the" + " log sequence number " LSN_PF + " in the system tablespace.", checkpoint_lsn, flush_lsn); } |