diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-13 15:47:38 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-13 15:47:38 +0200 |
| commit | 2e5aea4bab65544a44c7983759f80c5823780f76 (patch) | |
| tree | cdb64114b9375fc7705f68f898f695d1031c00a5 /mysql-test/suite/innodb | |
| parent | ad3346dddf419aed3e5d16066471fd5022af1795 (diff) | |
| parent | 621041b67698b040080b33928883336967687e1e (diff) | |
| download | mariadb-git-2e5aea4bab65544a44c7983759f80c5823780f76.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/suite/innodb')
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_zip_innochecksum.opt | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_zip_innochecksum.test | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/t/innodb_zip_innochecksum.opt b/mysql-test/suite/innodb/t/innodb_zip_innochecksum.opt index f8c8c9d247d..f47343e5e7c 100644 --- a/mysql-test/suite/innodb/t/innodb_zip_innochecksum.opt +++ b/mysql-test/suite/innodb/t/innodb_zip_innochecksum.opt @@ -1,4 +1,4 @@ --skip-innodb-doublewrite --innodb-file-per-table --innodb-file-format=Barracuda - +--innodb_checksum_algorithm=crc32 diff --git a/mysql-test/suite/innodb/t/innodb_zip_innochecksum.test b/mysql-test/suite/innodb/t/innodb_zip_innochecksum.test index 63a4b418677..fec8acf52c4 100644 --- a/mysql-test/suite/innodb/t/innodb_zip_innochecksum.test +++ b/mysql-test/suite/innodb/t/innodb_zip_innochecksum.test @@ -79,18 +79,22 @@ let SEARCH_PATTERN= Error: --strict-check option cannot be used together with -- --echo [9]: check the innochecksum with full form --strict-check=innodb # Server Default checksum = crc32 +--error 1 --exec $INNOCHECKSUM --strict-check=innodb $MYSQLD_DATADIR/test/tab1.ibd 2> $SEARCH_FILE --echo [10]: check the innochecksum with full form --strict-check=none --echo # when server Default checksum=crc32 +--error 1 --exec $INNOCHECKSUM --strict-check=none $MYSQLD_DATADIR/test/tab1.ibd 2> $SEARCH_FILE --echo [11]: check the innochecksum with short form -C innodb --echo # when server Default checksum=crc32 +--error 1 --exec $INNOCHECKSUM -C innodb $MYSQLD_DATADIR/test/tab1.ibd 2> $SEARCH_FILE --echo [12]: check the innochecksum with short form -C none --echo # when server Default checksum=crc32 +--error 1 --exec $INNOCHECKSUM -C none $MYSQLD_DATADIR/test/tab1.ibd 2> $SEARCH_FILE --echo [13]: check strict-check with invalid values |