diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-17 08:33:05 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-17 08:33:05 +0200 |
| commit | 41028d70f6e4ec866775bc8f9d00739ad3dbe0c2 (patch) | |
| tree | 6fa065e4b7b099081b10363681fed552deca973f | |
| parent | 4b3b1eb810f81cf8947500129eb25c129fabc629 (diff) | |
| download | mariadb-git-41028d70f6e4ec866775bc8f9d00739ad3dbe0c2.tar.gz | |
MDEV-29982 fixup: Relax the test
The log overwrite warnings are not being reliably emitted in all
debug-instrumented environments. It may be related to the
scheduling of some InnoDB internal activity, such as the purging
of committed transaction history.
| -rw-r--r-- | mysql-test/suite/encryption/r/innochecksum,debug.rdiff | 10 | ||||
| -rw-r--r-- | mysql-test/suite/encryption/t/innochecksum.test | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/mysql-test/suite/encryption/r/innochecksum,debug.rdiff b/mysql-test/suite/encryption/r/innochecksum,debug.rdiff deleted file mode 100644 index c3e3eed26bd..00000000000 --- a/mysql-test/suite/encryption/r/innochecksum,debug.rdiff +++ /dev/null @@ -1,10 +0,0 @@ -@@ -30,6 +30,9 @@ - # Space ID mismatch - # Restore the original tables - # Corrupt FIL_DATA+10 (data) -+# FOUND 1 is expected for both. -+FOUND 1 /InnoDB: Crash recovery is broken due to insufficient innodb_log_file_size; last checkpoint LSN=\d+, current LSN=\d+\. Shutdown is in progress\..*InnoDB: Crash recovery was broken.*/ in mysqld.1.err -+FOUND 1 /InnoDB: Crash recovery was broken/ in mysqld.1.err - # Run innochecksum on t2 - # Run innochecksum on t3 - # Run innochecksum on t6 diff --git a/mysql-test/suite/encryption/t/innochecksum.test b/mysql-test/suite/encryption/t/innochecksum.test index ecabce30ab7..516bc0733d9 100644 --- a/mysql-test/suite/encryption/t/innochecksum.test +++ b/mysql-test/suite/encryption/t/innochecksum.test @@ -264,7 +264,7 @@ print FILE pack("H*", "c00lcafedeadb017"); close FILE or die "close"; EOF -if ($have_debug) { +if (0 && $have_debug) { # these messages sometimes fail to appear --let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err --let SEARCH_PATTERN= InnoDB: Crash recovery is broken due to insufficient innodb_log_file_size; last checkpoint LSN=\\d+, current LSN=\\d+\\. Shutdown is in progress\\..*InnoDB: Crash recovery was broken.* --echo # FOUND 1 is expected for both. |