summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb_zip/t
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-03-30 09:34:07 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-03-30 09:34:07 +0300
commit5c69e936308b9b636d3e58aff624d2716f289fbd (patch)
treec04c8a4d2a160977b027d0c1b3acc44a70f53301 /mysql-test/suite/innodb_zip/t
parent88ce8a3d8be0346b325bc4da75894cd15e255857 (diff)
parenta4d753758fd5305853ba339a0cd57d1675d5aa8c (diff)
downloadmariadb-git-5c69e936308b9b636d3e58aff624d2716f289fbd.tar.gz
Merge 10.7 into 10.8
Diffstat (limited to 'mysql-test/suite/innodb_zip/t')
-rw-r--r--mysql-test/suite/innodb_zip/t/innochecksum.test8
1 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb_zip/t/innochecksum.test b/mysql-test/suite/innodb_zip/t/innochecksum.test
index 60860adeac8..b78cd4329de 100644
--- a/mysql-test/suite/innodb_zip/t/innochecksum.test
+++ b/mysql-test/suite/innodb_zip/t/innochecksum.test
@@ -57,9 +57,15 @@ let SEARCH_PATTERN= unknown option '-C';
--error 1
--exec $INNOCHECKSUM --no-check --write=crc32 $MYSQLD_DATADIR/test/tab1.ibd 2> $SEARCH_FILE
-let SEARCH_PATTERN= unknown variable 'write=crc32';
+--let SEARCH_PATTERN= ignoring option '--write' due to invalid value 'crc32'
--source include/search_pattern_in_file.inc
+--error 1
+--exec $INNOCHECKSUM --no-check $MYSQLD_DATADIR/test/tab1.ibd 2> $SEARCH_FILE
+--let SEARCH_PATTERN= Error: --no-check must be associated with --write option
+--source include/search_pattern_in_file.inc
+
+--exec $INNOCHECKSUM --no-check --write $MYSQLD_DATADIR/test/tab1.ibd
--source include/start_mysqld.inc
SELECT * FROM tab1;