diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-16 17:39:51 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-16 17:39:51 +0200 |
| commit | 91ceb815a8af206b46cb9d0092f46e67f3bb16a6 (patch) | |
| tree | 560e1f274bd4bf1a1f79c7a97760bde2e01b848c | |
| parent | 6546ea181f44328638b69dc935018531359c079e (diff) | |
| download | mariadb-git-bb-10.4-MDEV-12026.tar.gz | |
Revert to innodb_checksum_algorithm=crc32bb-10.4-MDEV-12026
The setting full_crc32 was enabled by default for test purposes only.
We will not change the default setting in MariaDB 10.4.
This reverts commit 9b48054c8b4d262eb792869e4262ada858c27545.
| -rw-r--r-- | mysql-test/suite/sys_vars/r/innodb_checksum_algorithm_basic.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_innodb.result | 4 | ||||
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/suite/sys_vars/r/innodb_checksum_algorithm_basic.result b/mysql-test/suite/sys_vars/r/innodb_checksum_algorithm_basic.result index 91d3c65597a..eec16411144 100644 --- a/mysql-test/suite/sys_vars/r/innodb_checksum_algorithm_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_checksum_algorithm_basic.result @@ -1,7 +1,7 @@ SET @orig = @@global.innodb_checksum_algorithm; SELECT @orig; @orig -full_crc32 +crc32 SET GLOBAL innodb_checksum_algorithm = 'crc32'; SELECT @@global.innodb_checksum_algorithm; @@global.innodb_checksum_algorithm @@ -52,4 +52,4 @@ strict_full_crc32 SET GLOBAL innodb_checksum_algorithm = @orig; SELECT @@global.innodb_checksum_algorithm; @@global.innodb_checksum_algorithm -full_crc32 +crc32 diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index c02730b7a3d..159d8ca7ae1 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -416,9 +416,9 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NONE VARIABLE_NAME INNODB_CHECKSUM_ALGORITHM SESSION_VALUE NULL -GLOBAL_VALUE full_crc32 +GLOBAL_VALUE crc32 GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE full_crc32 +DEFAULT_VALUE crc32 VARIABLE_SCOPE GLOBAL VARIABLE_TYPE ENUM VARIABLE_COMMENT The algorithm InnoDB uses for page checksumming. Possible values are FULL_CRC32 for new files, always use CRC-32C; for old, see CRC32 below; STRICT_FULL_CRC32 for new files, always use CRC-32C; for old, see STRICT_CRC32 below; CRC32 write crc32, allow any of the other checksums to match when reading; STRICT_CRC32 write crc32, do not allow other algorithms to match when reading; INNODB write a software calculated checksum, allow any other checksums to match when reading; STRICT_INNODB write a software calculated checksum, do not allow other algorithms to match when reading; NONE write a constant magic number, do not do any checksum verification when reading (same as innodb_checksums=OFF); STRICT_NONE write a constant magic number, do not allow values other than that magic number when reading; Files updated when this option is set to crc32 or strict_crc32 will not be readable by MariaDB versions older than 10.0.4; new files created with full_crc32 are readable by MariaDB 10.4.3+ diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 92539bd2048..06f2beea97c 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -18814,7 +18814,7 @@ static MYSQL_SYSVAR_ENUM(checksum_algorithm, srv_checksum_algorithm, " Files updated when this option is set to crc32 or strict_crc32 will" " not be readable by MariaDB versions older than 10.0.4;" " new files created with full_crc32 are readable by MariaDB 10.4.3+", - NULL, NULL, SRV_CHECKSUM_ALGORITHM_FULL_CRC32, + NULL, NULL, SRV_CHECKSUM_ALGORITHM_CRC32, &innodb_checksum_algorithm_typelib); static MYSQL_SYSVAR_BOOL(log_checksums, innodb_log_checksums, |