database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

Flag innodb_change_buffering as PLUGIN_VAR_DEPRECATED

Browse Source
This commit is contained in:
Marko Mäkelä
2022-03-04 13:19:52 +02:00
parent 15ce270036
commit 91803901e9
5 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/innodb/r/ibuf_not_empty.result
View File

@@ -7,7 +7,7 @@ ENGINE=InnoDB STATS_PERSISTENT=0;
SET GLOBAL innodb_change_buffering_debug = 1; SET GLOBAL innodb_change_buffering_debug = 1;
SET GLOBAL innodb_change_buffering=all; SET GLOBAL innodb_change_buffering=all;
Warnings: Warnings:
Warning 138 The parameter innodb_change_buffering is deprecated Warning 1287 '@@innodb_change_buffering' is deprecated and will be removed in a future release
INSERT INTO t1 SELECT 0,'x',1 FROM seq_1_to_1024; INSERT INTO t1 SELECT 0,'x',1 FROM seq_1_to_1024;
# restart: --innodb-force-recovery=6 --innodb-change-buffer-dump # restart: --innodb-force-recovery=6 --innodb-change-buffer-dump
check table t1; check table t1;

2
mysql-test/suite/innodb/r/innodb-change-buffer-recovery.result
View File

@@ -15,7 +15,7 @@ ENGINE=InnoDB STATS_PERSISTENT=0;
SET GLOBAL innodb_change_buffering_debug = 1; SET GLOBAL innodb_change_buffering_debug = 1;
SET GLOBAL innodb_change_buffering = all; SET GLOBAL innodb_change_buffering = all;
Warnings: Warnings:
Warning 138 The parameter innodb_change_buffering is deprecated Warning 1287 '@@innodb_change_buffering' is deprecated and will be removed in a future release
INSERT INTO t1 SELECT 0,'x',1 FROM seq_1_to_8192; INSERT INTO t1 SELECT 0,'x',1 FROM seq_1_to_8192;
BEGIN; BEGIN;
SELECT b FROM t1 LIMIT 3; SELECT b FROM t1 LIMIT 3;

8
mysql-test/suite/sys_vars/r/innodb_change_buffering_basic.result
View File

@@ -25,7 +25,7 @@ VARIABLE_NAME VARIABLE_VALUE
INNODB_CHANGE_BUFFERING none INNODB_CHANGE_BUFFERING none
set global innodb_change_buffering='none'; set global innodb_change_buffering='none';
Warnings: Warnings:
Warning 138 The parameter innodb_change_buffering is deprecated Warning 1287 '@@innodb_change_buffering' is deprecated and will be removed in a future release
select @@global.innodb_change_buffering; select @@global.innodb_change_buffering;
@@global.innodb_change_buffering @@global.innodb_change_buffering
none none
@@ -37,7 +37,7 @@ VARIABLE_NAME VARIABLE_VALUE
INNODB_CHANGE_BUFFERING none INNODB_CHANGE_BUFFERING none
set @@global.innodb_change_buffering='inserts'; set @@global.innodb_change_buffering='inserts';
Warnings: Warnings:
Warning 138 The parameter innodb_change_buffering is deprecated Warning 1287 '@@innodb_change_buffering' is deprecated and will be removed in a future release
select @@global.innodb_change_buffering; select @@global.innodb_change_buffering;
@@global.innodb_change_buffering @@global.innodb_change_buffering
inserts inserts
@@ -55,7 +55,7 @@ set global innodb_change_buffering=1.1;
ERROR 42000: Incorrect argument type to variable 'innodb_change_buffering' ERROR 42000: Incorrect argument type to variable 'innodb_change_buffering'
set global innodb_change_buffering=1; set global innodb_change_buffering=1;
Warnings: Warnings:
Warning 138 The parameter innodb_change_buffering is deprecated Warning 1287 '@@innodb_change_buffering' is deprecated and will be removed in a future release
SELECT @@global.innodb_change_buffering; SELECT @@global.innodb_change_buffering;
@@global.innodb_change_buffering @@global.innodb_change_buffering
inserts inserts
@@ -67,7 +67,7 @@ set global innodb_change_buffering='some';
ERROR 42000: Variable 'innodb_change_buffering' can't be set to the value of 'some' ERROR 42000: Variable 'innodb_change_buffering' can't be set to the value of 'some'
SET @@global.innodb_change_buffering = @start_global_value; SET @@global.innodb_change_buffering = @start_global_value;
Warnings: Warnings:
Warning 138 The parameter innodb_change_buffering is deprecated Warning 1287 '@@innodb_change_buffering' is deprecated and will be removed in a future release
SELECT @@global.innodb_change_buffering; SELECT @@global.innodb_change_buffering;
@@global.innodb_change_buffering @@global.innodb_change_buffering
none none

2
mysql-test/suite/sys_vars/r/sysvars_innodb.result
View File

@@ -230,7 +230,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE none DEFAULT_VALUE none
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE ENUM VARIABLE_TYPE ENUM
VARIABLE_COMMENT Buffer changes to secondary indexes (deprecated). VARIABLE_COMMENT Buffer changes to secondary indexes.
NUMERIC_MIN_VALUE NULL NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL

15
storage/innobase/handler/ha_innodb.cc
View File

@@ -417,14 +417,6 @@ static TYPELIB innodb_change_buffering_typelib = {
NULL NULL
}; };
static void innodb_change_buffering_deprecated(THD *thd, st_mysql_sys_var*,
void *var_ptr, const void *save)
{
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, HA_ERR_UNSUPPORTED,
"The parameter innodb_change_buffering is deprecated");
*static_cast<ulong*>(var_ptr) = *static_cast<const ulong*>(save);
}
/** Allowed values of innodb_instant_alter_column_allowed */ /** Allowed values of innodb_instant_alter_column_allowed */
const char* innodb_instant_alter_column_allowed_names[] = { const char* innodb_instant_alter_column_allowed_names[] = {
"never", /* compatible with MariaDB 5.5 to 10.2 */ "never", /* compatible with MariaDB 5.5 to 10.2 */
@@ -19461,10 +19453,9 @@ static MYSQL_SYSVAR_BOOL(numa_interleave, srv_numa_interleave,
#endif /* HAVE_LIBNUMA */ #endif /* HAVE_LIBNUMA */
static MYSQL_SYSVAR_ENUM(change_buffering, innodb_change_buffering, static MYSQL_SYSVAR_ENUM(change_buffering, innodb_change_buffering,
PLUGIN_VAR_RQCMDARG, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_DEPRECATED,
"Buffer changes to secondary indexes (deprecated).", "Buffer changes to secondary indexes.",
nullptr, innodb_change_buffering_deprecated, IBUF_USE_NONE, nullptr, nullptr, IBUF_USE_NONE, &innodb_change_buffering_typelib);
&innodb_change_buffering_typelib);
static MYSQL_SYSVAR_UINT(change_buffer_max_size, static MYSQL_SYSVAR_UINT(change_buffer_max_size,
srv_change_buffer_max_size, srv_change_buffer_max_size,