summaryrefslogtreecommitdiff
path: root/mysql-test/suite/encryption/r
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-04-06 13:00:09 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-04-06 13:00:09 +0300
commit2d8e38bc9477aa00b371ed14d95390bede70c5cb (patch)
tree7d4e4e22138572b769263994697d69bd141c5bf3 /mysql-test/suite/encryption/r
parentb249abde57f1788a8085f45cc6252ee70ece3354 (diff)
parent4e1ca388381eea27a9275571744ad17ce317b273 (diff)
downloadmariadb-git-2d8e38bc9477aa00b371ed14d95390bede70c5cb.tar.gz
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/suite/encryption/r')
-rw-r--r--mysql-test/suite/encryption/r/innochecksum.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/encryption/r/innochecksum.result b/mysql-test/suite/encryption/r/innochecksum.result
index 5dc6ed90acc..7c68164e52a 100644
--- a/mysql-test/suite/encryption/r/innochecksum.result
+++ b/mysql-test/suite/encryption/r/innochecksum.result
@@ -7,7 +7,7 @@ CREATE TABLE t3 (a INT AUTO_INCREMENT PRIMARY KEY, b TEXT) ENGINE=InnoDB ROW_FOR
CREATE TABLE t4 (a INT AUTO_INCREMENT PRIMARY KEY, b TEXT) ENGINE=InnoDB PAGE_COMPRESSED=1;
CREATE TABLE t5 (a INT AUTO_INCREMENT PRIMARY KEY, b TEXT) ENGINE=InnoDB PAGE_COMPRESSED=1 ENCRYPTED=YES ENCRYPTION_KEY_ID=4;
CREATE TABLE t6 (a INT AUTO_INCREMENT PRIMARY KEY, b TEXT) ENGINE=InnoDB;
-# Run innochecksum on t1
+# Run innochecksum on t1, check -S does not cause crash for encrypted file
# Run innochecksum on t2
# Run innochecksum on t3
# Run innochecksum on t4