Skip to content

M
MariaDB
Commit 08e8ad7c authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

MDEV-25106 Deprecation warning for innodb_checksum_algorithm=none,innodb,... 

MDEV-25105 (commit 7a4fbb55)
in MariaDB 10.6 will refuse the innodb_checksum_algorithm
values none, innodb, strict_none, strict_innodb.

We will issue a deprecation warning if innodb_checksum_algorithm
is set to any of these non-default unsafe values.

innodb_checksum_algorithm=crc32 was made the default in
MySQL 5.7 and MariaDB Server 10.2, and given that older versions
of the server have reached their end of life, there is no valid
reason to use anything else than innodb_checksum_algorithm=crc32
or innodb_checksum_algorithm=strict_crc32 in MariaDB 10.3.

Reviewed by: Sergei Golubchik
parent 6e7ac406
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 3 deletions
mysql-test/suite/encryption/r/innodb-checksum-algorithm.result
View file @ 08e8ad7c
...@@ -8,6 +8,8 @@ SET GLOBAL innodb_encrypt_tables = ON; ...@@ -8,6 +8,8 @@ SET GLOBAL innodb_encrypt_tables = ON;
SET GLOBAL innodb_encryption_threads = 4; SET GLOBAL innodb_encryption_threads = 4;
call mtr.add_suppression("InnoDB: innodb_checksum_algorithm is set to \"strict_(crc32|none|innodb)\" but the page \\[page id: space=[0-9]+, page number=[0-9]+\\] contains a valid checksum \"(innodb|none|crc32)\""); call mtr.add_suppression("InnoDB: innodb_checksum_algorithm is set to \"strict_(crc32|none|innodb)\" but the page \\[page id: space=[0-9]+, page number=[0-9]+\\] contains a valid checksum \"(innodb|none|crc32)\"");
SET GLOBAL innodb_checksum_algorithm = innodb; SET GLOBAL innodb_checksum_algorithm = innodb;
Warnings:
Warning 138 Setting innodb_checksum_algorithm to values other than crc32 or strict_crc32 is UNSAFE and DEPRECATED. These deprecated values will be disallowed in MariaDB 10.6.
SET GLOBAL innodb_default_encryption_key_id=4; SET GLOBAL innodb_default_encryption_key_id=4;
SET GLOBAL innodb_checksum_algorithm=crc32; SET GLOBAL innodb_checksum_algorithm=crc32;
create table tce_crc32(a serial, b blob, index(b(10))) engine=innodb create table tce_crc32(a serial, b blob, index(b(10))) engine=innodb
...@@ -90,6 +92,8 @@ update tpe_crc32 set b=substr(b,1); ...@@ -90,6 +92,8 @@ update tpe_crc32 set b=substr(b,1);
ALTER TABLE tp_crc32 IMPORT TABLESPACE; ALTER TABLE tp_crc32 IMPORT TABLESPACE;
update tp_crc32 set b=substr(b,1); update tp_crc32 set b=substr(b,1);
SET GLOBAL innodb_checksum_algorithm=innodb; SET GLOBAL innodb_checksum_algorithm=innodb;
Warnings:
Warning 138 Setting innodb_checksum_algorithm to values other than crc32 or strict_crc32 is UNSAFE and DEPRECATED. These deprecated values will be disallowed in MariaDB 10.6.
ALTER TABLE tce_crc32 DISCARD TABLESPACE; ALTER TABLE tce_crc32 DISCARD TABLESPACE;
ALTER TABLE tc_crc32 DISCARD TABLESPACE; ALTER TABLE tc_crc32 DISCARD TABLESPACE;
ALTER TABLE te_crc32 DISCARD TABLESPACE; ALTER TABLE te_crc32 DISCARD TABLESPACE;
...@@ -115,6 +119,8 @@ update tpe_crc32 set b=substr(b,1); ...@@ -115,6 +119,8 @@ update tpe_crc32 set b=substr(b,1);
ALTER TABLE tp_crc32 IMPORT TABLESPACE; ALTER TABLE tp_crc32 IMPORT TABLESPACE;
update tp_crc32 set b=substr(b,1); update tp_crc32 set b=substr(b,1);
SET GLOBAL innodb_checksum_algorithm=none; SET GLOBAL innodb_checksum_algorithm=none;
Warnings:
Warning 138 Setting innodb_checksum_algorithm to values other than crc32 or strict_crc32 is UNSAFE and DEPRECATED. These deprecated values will be disallowed in MariaDB 10.6.
ALTER TABLE tce_crc32 DISCARD TABLESPACE; ALTER TABLE tce_crc32 DISCARD TABLESPACE;
ALTER TABLE tc_crc32 DISCARD TABLESPACE; ALTER TABLE tc_crc32 DISCARD TABLESPACE;
ALTER TABLE te_crc32 DISCARD TABLESPACE; ALTER TABLE te_crc32 DISCARD TABLESPACE;
...@@ -151,6 +157,8 @@ test.tp_crc32 check status OK ...@@ -151,6 +157,8 @@ test.tp_crc32 check status OK
DROP TABLE tce_crc32, tc_crc32, te_crc32, DROP TABLE tce_crc32, tc_crc32, te_crc32,
t_crc32, tpe_crc32, tp_crc32; t_crc32, tpe_crc32, tp_crc32;
SET GLOBAL innodb_checksum_algorithm=innodb; SET GLOBAL innodb_checksum_algorithm=innodb;
Warnings:
Warning 138 Setting innodb_checksum_algorithm to values other than crc32 or strict_crc32 is UNSAFE and DEPRECATED. These deprecated values will be disallowed in MariaDB 10.6.
create table tce_innodb(a serial, b blob, index(b(10))) engine=innodb create table tce_innodb(a serial, b blob, index(b(10))) engine=innodb
ROW_FORMAT=COMPRESSED encrypted=yes; ROW_FORMAT=COMPRESSED encrypted=yes;
create table tc_innodb(a serial, b blob, index(b(10))) engine=innodb create table tc_innodb(a serial, b blob, index(b(10))) engine=innodb
...@@ -231,6 +239,8 @@ update tpe_innodb set b=substr(b,1); ...@@ -231,6 +239,8 @@ update tpe_innodb set b=substr(b,1);
ALTER TABLE tp_innodb IMPORT TABLESPACE; ALTER TABLE tp_innodb IMPORT TABLESPACE;
update tp_innodb set b=substr(b,1); update tp_innodb set b=substr(b,1);
SET GLOBAL innodb_checksum_algorithm=innodb; SET GLOBAL innodb_checksum_algorithm=innodb;
Warnings:
Warning 138 Setting innodb_checksum_algorithm to values other than crc32 or strict_crc32 is UNSAFE and DEPRECATED. These deprecated values will be disallowed in MariaDB 10.6.
ALTER TABLE tce_innodb DISCARD TABLESPACE; ALTER TABLE tce_innodb DISCARD TABLESPACE;
ALTER TABLE tc_innodb DISCARD TABLESPACE; ALTER TABLE tc_innodb DISCARD TABLESPACE;
ALTER TABLE te_innodb DISCARD TABLESPACE; ALTER TABLE te_innodb DISCARD TABLESPACE;
...@@ -256,6 +266,8 @@ update tpe_innodb set b=substr(b,1); ...@@ -256,6 +266,8 @@ update tpe_innodb set b=substr(b,1);
ALTER TABLE tp_innodb IMPORT TABLESPACE; ALTER TABLE tp_innodb IMPORT TABLESPACE;
update tp_innodb set b=substr(b,1); update tp_innodb set b=substr(b,1);
SET GLOBAL innodb_checksum_algorithm=none; SET GLOBAL innodb_checksum_algorithm=none;
Warnings:
Warning 138 Setting innodb_checksum_algorithm to values other than crc32 or strict_crc32 is UNSAFE and DEPRECATED. These deprecated values will be disallowed in MariaDB 10.6.
ALTER TABLE tce_innodb DISCARD TABLESPACE; ALTER TABLE tce_innodb DISCARD TABLESPACE;
ALTER TABLE tc_innodb DISCARD TABLESPACE; ALTER TABLE tc_innodb DISCARD TABLESPACE;
ALTER TABLE te_innodb DISCARD TABLESPACE; ALTER TABLE te_innodb DISCARD TABLESPACE;
...@@ -292,6 +304,8 @@ test.tp_innodb check status OK ...@@ -292,6 +304,8 @@ test.tp_innodb check status OK
DROP TABLE tce_innodb, tc_innodb, te_innodb, DROP TABLE tce_innodb, tc_innodb, te_innodb,
t_innodb, tpe_innodb, tp_innodb; t_innodb, tpe_innodb, tp_innodb;
SET GLOBAL innodb_checksum_algorithm=none; SET GLOBAL innodb_checksum_algorithm=none;
Warnings:
Warning 138 Setting innodb_checksum_algorithm to values other than crc32 or strict_crc32 is UNSAFE and DEPRECATED. These deprecated values will be disallowed in MariaDB 10.6.
create table tce_none(a serial, b blob, index(b(10))) engine=innodb create table tce_none(a serial, b blob, index(b(10))) engine=innodb
ROW_FORMAT=COMPRESSED encrypted=yes; ROW_FORMAT=COMPRESSED encrypted=yes;
create table tc_none(a serial, b blob, index(b(10))) engine=innodb create table tc_none(a serial, b blob, index(b(10))) engine=innodb
...@@ -372,6 +386,8 @@ update tpe_none set b=substr(b,1); ...@@ -372,6 +386,8 @@ update tpe_none set b=substr(b,1);
ALTER TABLE tp_none IMPORT TABLESPACE; ALTER TABLE tp_none IMPORT TABLESPACE;
update tp_none set b=substr(b,1); update tp_none set b=substr(b,1);
SET GLOBAL innodb_checksum_algorithm=innodb; SET GLOBAL innodb_checksum_algorithm=innodb;
Warnings:
Warning 138 Setting innodb_checksum_algorithm to values other than crc32 or strict_crc32 is UNSAFE and DEPRECATED. These deprecated values will be disallowed in MariaDB 10.6.
ALTER TABLE tce_none DISCARD TABLESPACE; ALTER TABLE tce_none DISCARD TABLESPACE;
ALTER TABLE tc_none DISCARD TABLESPACE; ALTER TABLE tc_none DISCARD TABLESPACE;
ALTER TABLE te_none DISCARD TABLESPACE; ALTER TABLE te_none DISCARD TABLESPACE;
...@@ -397,6 +413,8 @@ update tpe_none set b=substr(b,1); ...@@ -397,6 +413,8 @@ update tpe_none set b=substr(b,1);
ALTER TABLE tp_none IMPORT TABLESPACE; ALTER TABLE tp_none IMPORT TABLESPACE;
update tp_none set b=substr(b,1); update tp_none set b=substr(b,1);
SET GLOBAL innodb_checksum_algorithm=none; SET GLOBAL innodb_checksum_algorithm=none;
Warnings:
Warning 138 Setting innodb_checksum_algorithm to values other than crc32 or strict_crc32 is UNSAFE and DEPRECATED. These deprecated values will be disallowed in MariaDB 10.6.
ALTER TABLE tce_none DISCARD TABLESPACE; ALTER TABLE tce_none DISCARD TABLESPACE;
ALTER TABLE tc_none DISCARD TABLESPACE; ALTER TABLE tc_none DISCARD TABLESPACE;
ALTER TABLE te_none DISCARD TABLESPACE; ALTER TABLE te_none DISCARD TABLESPACE;
......
mysql-test/suite/sys_vars/r/innodb_checksum_algorithm_basic.result
View file @ 08e8ad7c
...@@ -11,18 +11,26 @@ SELECT @@global.innodb_checksum_algorithm; ...@@ -11,18 +11,26 @@ SELECT @@global.innodb_checksum_algorithm;
@@global.innodb_checksum_algorithm @@global.innodb_checksum_algorithm
strict_crc32 strict_crc32
SET GLOBAL innodb_checksum_algorithm = 'innodb'; SET GLOBAL innodb_checksum_algorithm = 'innodb';
Warnings:
Warning 138 Setting innodb_checksum_algorithm to values other than crc32 or strict_crc32 is UNSAFE and DEPRECATED. These deprecated values will be disallowed in MariaDB 10.6.
SELECT @@global.innodb_checksum_algorithm; SELECT @@global.innodb_checksum_algorithm;
@@global.innodb_checksum_algorithm @@global.innodb_checksum_algorithm
innodb innodb
SET GLOBAL innodb_checksum_algorithm = 'strict_innodb'; SET GLOBAL innodb_checksum_algorithm = 'strict_innodb';
Warnings:
Warning 138 Setting innodb_checksum_algorithm to values other than crc32 or strict_crc32 is UNSAFE and DEPRECATED. These deprecated values will be disallowed in MariaDB 10.6.
SELECT @@global.innodb_checksum_algorithm; SELECT @@global.innodb_checksum_algorithm;
@@global.innodb_checksum_algorithm @@global.innodb_checksum_algorithm
strict_innodb strict_innodb
SET GLOBAL innodb_checksum_algorithm = 'none'; SET GLOBAL innodb_checksum_algorithm = 'none';
Warnings:
Warning 138 Setting innodb_checksum_algorithm to values other than crc32 or strict_crc32 is UNSAFE and DEPRECATED. These deprecated values will be disallowed in MariaDB 10.6.
SELECT @@global.innodb_checksum_algorithm; SELECT @@global.innodb_checksum_algorithm;
@@global.innodb_checksum_algorithm @@global.innodb_checksum_algorithm
none none
SET GLOBAL innodb_checksum_algorithm = 'strict_none'; SET GLOBAL innodb_checksum_algorithm = 'strict_none';
Warnings:
Warning 138 Setting innodb_checksum_algorithm to values other than crc32 or strict_crc32 is UNSAFE and DEPRECATED. These deprecated values will be disallowed in MariaDB 10.6.
SELECT @@global.innodb_checksum_algorithm; SELECT @@global.innodb_checksum_algorithm;
@@global.innodb_checksum_algorithm @@global.innodb_checksum_algorithm
strict_none strict_none
......
storage/innobase/handler/ha_innodb.cc
View file @ 08e8ad7c
...@@ -3509,6 +3509,11 @@ static int innodb_init_abort() ...@@ -3509,6 +3509,11 @@ static int innodb_init_abort()
static const char* deprecated_idle_flush_pct static const char* deprecated_idle_flush_pct
= "innodb_idle_flush_pct is DEPRECATED and has no effect."; = "innodb_idle_flush_pct is DEPRECATED and has no effect.";
static const char* deprecated_innodb_checksum_algorithm
= "Setting innodb_checksum_algorithm to values other than"
" crc32 or strict_crc32 is UNSAFE and DEPRECATED."
" These deprecated values will be disallowed in MariaDB 10.6.";
static ulong innodb_idle_flush_pct; static ulong innodb_idle_flush_pct;
/** If applicable, emit a message that log checksums cannot be disabled. /** If applicable, emit a message that log checksums cannot be disabled.
...@@ -3537,6 +3542,21 @@ innodb_log_checksums_func_update(THD* thd, bool check) ...@@ -3537,6 +3542,21 @@ innodb_log_checksums_func_update(THD* thd, bool check)
return(check); return(check);
} }
static void innodb_checksum_algorithm_update(THD *thd, st_mysql_sys_var*,
void *, const void *save)
{
srv_checksum_algorithm= *static_cast<const ulong*>(save);
switch (srv_checksum_algorithm) {
case SRV_CHECKSUM_ALGORITHM_CRC32:
case SRV_CHECKSUM_ALGORITHM_STRICT_CRC32:
break;
default:
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
HA_ERR_UNSUPPORTED,
deprecated_innodb_checksum_algorithm);
}
}
/****************************************************************//** /****************************************************************//**
Gives the file extension of an InnoDB single-table tablespace. */ Gives the file extension of an InnoDB single-table tablespace. */
static const char* ha_innobase_exts[] = { static const char* ha_innobase_exts[] = {
...@@ -3953,9 +3973,16 @@ static int innodb_init_params() ...@@ -3953,9 +3973,16 @@ static int innodb_init_params()
if (!innobase_use_checksums) { if (!innobase_use_checksums) {
ib::warn() << "Setting innodb_checksums to OFF is DEPRECATED." ib::warn() << "Setting innodb_checksums to OFF is DEPRECATED."
" This option may be removed in future releases. You" " This option was removed in MariaDB 10.5.";
" should set innodb_checksum_algorithm=NONE instead.";
srv_checksum_algorithm = SRV_CHECKSUM_ALGORITHM_NONE; srv_checksum_algorithm = SRV_CHECKSUM_ALGORITHM_NONE;
} else {
switch (srv_checksum_algorithm) {
case SRV_CHECKSUM_ALGORITHM_CRC32:
case SRV_CHECKSUM_ALGORITHM_STRICT_CRC32:
break;
default:
ib::warn() << deprecated_innodb_checksum_algorithm;
}
} }
innodb_log_checksums = innodb_log_checksums_func_update( innodb_log_checksums = innodb_log_checksums_func_update(
...@@ -19111,7 +19138,7 @@ static MYSQL_SYSVAR_ENUM(checksum_algorithm, srv_checksum_algorithm, ...@@ -19111,7 +19138,7 @@ static MYSQL_SYSVAR_ENUM(checksum_algorithm, srv_checksum_algorithm,
" magic number when reading;" " magic number when reading;"
" Files updated when this option is set to crc32 or strict_crc32 will" " Files updated when this option is set to crc32 or strict_crc32 will"
" not be readable by MariaDB versions older than 10.0.4", " not be readable by MariaDB versions older than 10.0.4",
NULL, NULL, SRV_CHECKSUM_ALGORITHM_CRC32, NULL, innodb_checksum_algorithm_update, SRV_CHECKSUM_ALGORITHM_CRC32,
&innodb_checksum_algorithm_typelib); &innodb_checksum_algorithm_typelib);
static MYSQL_SYSVAR_BOOL(log_checksums, innodb_log_checksums, static MYSQL_SYSVAR_BOOL(log_checksums, innodb_log_checksums,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7