diff options
| author | Daniel Black <daniel@mariadb.org> | 2023-04-11 17:23:55 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2023-04-11 17:47:34 +1000 |
| commit | 4472a7b4ff79853d931288c1ab8d49bf130e3908 (patch) | |
| tree | 925725da0180efc2f0921f3c3950919b996a6b9f | |
| parent | 320a4b52c9c73a37b3553cec6a9d170924957c36 (diff) | |
| download | mariadb-git-4472a7b4ff79853d931288c1ab8d49bf130e3908.tar.gz | |
MDEV-30205: /usr/share/mysql-test -> mariadb-test (fix)
A suppression was needed for encryption.innodb-bad-key-change
due to the path change.
| -rw-r--r-- | mysql-test/suite/encryption/r/innodb-bad-key-change.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/encryption/t/innodb-bad-key-change.test | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/encryption/r/innodb-bad-key-change.result b/mysql-test/suite/encryption/r/innodb-bad-key-change.result index eb114fcf6fc..a034e68e251 100644 --- a/mysql-test/suite/encryption/r/innodb-bad-key-change.result +++ b/mysql-test/suite/encryption/r/innodb-bad-key-change.result @@ -6,6 +6,7 @@ call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page n call mtr.add_suppression("failed to read \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\]"); call mtr.add_suppression("InnoDB: Encrypted page \\[page id: space=[1-9][0-9]*, page number=3\\] in file .*test.t1.ibd looks corrupted; key_version=1"); call mtr.add_suppression("File '.*mysql-test.std_data.keysbad3\\.txt' not found"); +call mtr.add_suppression("File '.*mariadb-test.std_data.keysbad3\\.txt' not found"); call mtr.add_suppression("\\[ERROR\\] InnoDB: Cannot decrypt \\[page id: space="); # Start server with keys2.txt # restart: --file-key-management-filename=MYSQL_TEST_DIR/std_data/keys2.txt diff --git a/mysql-test/suite/encryption/t/innodb-bad-key-change.test b/mysql-test/suite/encryption/t/innodb-bad-key-change.test index 5eefded9ae1..27483ae35d0 100644 --- a/mysql-test/suite/encryption/t/innodb-bad-key-change.test +++ b/mysql-test/suite/encryption/t/innodb-bad-key-change.test @@ -16,6 +16,7 @@ call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page n call mtr.add_suppression("failed to read \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\]"); call mtr.add_suppression("InnoDB: Encrypted page \\[page id: space=[1-9][0-9]*, page number=3\\] in file .*test.t1.ibd looks corrupted; key_version=1"); call mtr.add_suppression("File '.*mysql-test.std_data.keysbad3\\.txt' not found"); +call mtr.add_suppression("File '.*mariadb-test.std_data.keysbad3\\.txt' not found"); # for innodb_checksum_algorithm=full_crc32 only call mtr.add_suppression("\\[ERROR\\] InnoDB: Cannot decrypt \\[page id: space="); |