mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-26 16:54:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-18650: Options deprecated in previous versions - thread_concurrency

Browse source 
thread_concurrency was ignored since 5.5. Remove it.
This commit is contained in:
Vicențiu Ciorbaru 2020-01-21 15:39:02 +02:00
parent fc5a4cfdf5
commit 8bbcaab160
15 changed files with 8 additions and 429 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/my_sys.h
View file

@ -287,7 +287,6 @@ extern my_bool my_disable_locking, my_disable_async_io,
extern my_bool my_disable_sync, my_disable_copystat_in_redel; extern my_bool my_disable_sync, my_disable_copystat_in_redel;
extern char wild_many,wild_one,wild_prefix; extern char wild_many,wild_one,wild_prefix;
extern const char *charsets_dir; extern const char *charsets_dir;
extern my_bool timed_mutexes;
enum cache_type enum cache_type
{ {

3
mysql-test/main/mysqld--help.result
View file

@ -1364,8 +1364,6 @@ The following specify which files/extra groups are read (specified before remain
created to handle remaining clients. created to handle remaining clients.
--thread-stack=# The stack size for each thread --thread-stack=# The stack size for each thread
--time-format=name The TIME format (ignored) --time-format=name The TIME format (ignored)
--timed-mutexes Specify whether to time mutexes. Deprecated, has no
effect.
--tls-version=name TLS protocol version for secure connections.. Any --tls-version=name TLS protocol version for secure connections.. Any
combination of: TLSv1.0, TLSv1.1, TLSv1.2, TLSv1.3 combination of: TLSv1.0, TLSv1.1, TLSv1.2, TLSv1.3
--tmp-disk-table-size=# --tmp-disk-table-size=#
@ -1772,7 +1770,6 @@ thread-pool-priority auto
thread-pool-stall-limit 500 thread-pool-stall-limit 500
thread-stack 299008 thread-stack 299008
time-format %H:%i:%s time-format %H:%i:%s
timed-mutexes FALSE
tmp-disk-table-size 18446744073709551615 tmp-disk-table-size 18446744073709551615
tmp-memory-table-size 16777216 tmp-memory-table-size 16777216
tmp-table-size 16777216 tmp-table-size 16777216

18
mysql-test/main/variables.result
View file

@ -187,24 +187,6 @@ set global concurrent_insert=DEFAULT;
select @@concurrent_insert; select @@concurrent_insert;
@@concurrent_insert @@concurrent_insert
AUTO AUTO
set global timed_mutexes=ON;
Warnings:
Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release
show variables like 'timed_mutexes';
Variable_name Value
timed_mutexes ON
select * from information_schema.session_variables where variable_name like 'timed_mutexes';
VARIABLE_NAME VARIABLE_VALUE
TIMED_MUTEXES ON
set global timed_mutexes=0;
Warnings:
Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release
show variables like 'timed_mutexes';
Variable_name Value
timed_mutexes OFF
select * from information_schema.session_variables where variable_name like 'timed_mutexes';
VARIABLE_NAME VARIABLE_VALUE
TIMED_MUTEXES OFF
set default_storage_engine=MYISAM, default_storage_engine="HEAP", global default_storage_engine="MERGE"; set default_storage_engine=MYISAM, default_storage_engine="HEAP", global default_storage_engine="MERGE";
show local variables like 'default_storage_engine'; show local variables like 'default_storage_engine';
Variable_name Value Variable_name Value

7
mysql-test/main/variables.test
View file

@ -125,13 +125,6 @@ select * from information_schema.session_variables where variable_name like 'con
set global concurrent_insert=DEFAULT; set global concurrent_insert=DEFAULT;
select @@concurrent_insert; select @@concurrent_insert;
set global timed_mutexes=ON;
show variables like 'timed_mutexes';
select * from information_schema.session_variables where variable_name like 'timed_mutexes';
set global timed_mutexes=0;
show variables like 'timed_mutexes';
select * from information_schema.session_variables where variable_name like 'timed_mutexes';
set default_storage_engine=MYISAM, default_storage_engine="HEAP", global default_storage_engine="MERGE"; set default_storage_engine=MYISAM, default_storage_engine="HEAP", global default_storage_engine="MERGE";
show local variables like 'default_storage_engine'; show local variables like 'default_storage_engine';
select * from information_schema.session_variables where variable_name like 'default_storage_engine'; select * from information_schema.session_variables where variable_name like 'default_storage_engine';

20
mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
View file

@ -3433,16 +3433,6 @@ NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME THREAD_CONCURRENCY
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Permits the application to give the threads system a hint for the desired number of threads that should be run at the same time.This variable has no effect, and is deprecated. It will be removed in a future release.
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 512
NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL
READ_ONLY YES
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME THREAD_HANDLING VARIABLE_NAME THREAD_HANDLING
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE ENUM VARIABLE_TYPE ENUM
@ -3463,16 +3453,6 @@ NUMERIC_BLOCK_SIZE 1024
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY YES READ_ONLY YES
COMMAND_LINE_ARGUMENT REQUIRED COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME TIMED_MUTEXES
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Specify whether to time mutexes. Deprecated, has no effect.
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST OFF,ON
READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME TIMESTAMP VARIABLE_NAME TIMESTAMP
VARIABLE_SCOPE SESSION ONLY VARIABLE_SCOPE SESSION ONLY
VARIABLE_TYPE DOUBLE VARIABLE_TYPE DOUBLE

20
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
View file

@ -4133,16 +4133,6 @@ NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME THREAD_CONCURRENCY
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Permits the application to give the threads system a hint for the desired number of threads that should be run at the same time.This variable has no effect, and is deprecated. It will be removed in a future release.
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 512
NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL
READ_ONLY YES
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME THREAD_HANDLING VARIABLE_NAME THREAD_HANDLING
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE ENUM VARIABLE_TYPE ENUM
@ -4253,16 +4243,6 @@ NUMERIC_BLOCK_SIZE 1024
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY YES READ_ONLY YES
COMMAND_LINE_ARGUMENT REQUIRED COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME TIMED_MUTEXES
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Specify whether to time mutexes. Deprecated, has no effect.
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST OFF,ON
READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME TIMESTAMP VARIABLE_NAME TIMESTAMP
VARIABLE_SCOPE SESSION ONLY VARIABLE_SCOPE SESSION ONLY
VARIABLE_TYPE DOUBLE VARIABLE_TYPE DOUBLE

21
mysql-test/suite/sys_vars/r/thread_concurrency_basic.result
View file

@ -1,21 +0,0 @@
select @@global.thread_concurrency;
@@global.thread_concurrency
10
select @@session.thread_concurrency;
ERROR HY000: Variable 'thread_concurrency' is a GLOBAL variable
show global variables like 'thread_concurrency';
Variable_name Value
thread_concurrency 10
show session variables like 'thread_concurrency';
Variable_name Value
thread_concurrency 10
select * from information_schema.global_variables where variable_name='thread_concurrency';
VARIABLE_NAME VARIABLE_VALUE
THREAD_CONCURRENCY 10
select * from information_schema.session_variables where variable_name='thread_concurrency';
VARIABLE_NAME VARIABLE_VALUE
THREAD_CONCURRENCY 10
set global thread_concurrency=1;
ERROR HY000: Variable 'thread_concurrency' is a read only variable
set session thread_concurrency=1;
ERROR HY000: Variable 'thread_concurrency' is a read only variable

124
mysql-test/suite/sys_vars/r/timed_mutexes_basic.result
View file

@ -1,124 +0,0 @@
SET @global_start_value = @@global.timed_mutexes;
SELECT @global_start_value;
@global_start_value
0
'#--------------------FN_DYNVARS_177_01------------------------#'
SET @@global.timed_mutexes = 1;
Warnings:
Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release
SET @@global.timed_mutexes = DEFAULT;
Warnings:
Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release
SELECT @@global.timed_mutexes;
@@global.timed_mutexes
0
'#---------------------FN_DYNVARS_177_02-------------------------#'
SET timed_mutexes = 1;
ERROR HY000: Variable 'timed_mutexes' is a GLOBAL variable and should be set with SET GLOBAL
SELECT @@timed_mutexes;
@@timed_mutexes
0
SELECT global.timed_mutexes;
ERROR 42S02: Unknown table 'global' in field list
SET global timed_mutexes = 1;
Warnings:
Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release
SELECT @@global.timed_mutexes;
@@global.timed_mutexes
1
'#--------------------FN_DYNVARS_177_03------------------------#'
SET @@global.timed_mutexes = 0;
Warnings:
Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release
SELECT @@global.timed_mutexes;
@@global.timed_mutexes
0
SET @@global.timed_mutexes = 1;
Warnings:
Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release
SELECT @@global.timed_mutexes;
@@global.timed_mutexes
1
'#--------------------FN_DYNVARS_177_04-------------------------#'
SET @@global.timed_mutexes = -1;
ERROR 42000: Variable 'timed_mutexes' can't be set to the value of '-1'
SET @@global.timed_mutexes = 2;
ERROR 42000: Variable 'timed_mutexes' can't be set to the value of '2'
SET @@global.timed_mutexes = "T";
ERROR 42000: Variable 'timed_mutexes' can't be set to the value of 'T'
SET @@global.timed_mutexes = "Y";
ERROR 42000: Variable 'timed_mutexes' can't be set to the value of 'Y'
SET @@global.timed_mutexes = _true;
ERROR 42000: Variable 'timed_mutexes' can't be set to the value of '_true'
SET @@global.timed_mutexes = 0N;
ERROR 42000: Variable 'timed_mutexes' can't be set to the value of '0N'
SET @@global.timed_mutexes = 1+1;
ERROR 42000: Variable 'timed_mutexes' can't be set to the value of '2'
SET @@global.timed_mutexes = 0FF;
ERROR 42000: Variable 'timed_mutexes' can't be set to the value of '0FF'
SET @@global.timed_mutexes = '0';
ERROR 42000: Variable 'timed_mutexes' can't be set to the value of '0'
SET @@global.timed_mutexes = N;
ERROR 42000: Variable 'timed_mutexes' can't be set to the value of 'N'
'#-------------------FN_DYNVARS_177_05----------------------------#'
SET @@session.timed_mutexes = 0;
ERROR HY000: Variable 'timed_mutexes' is a GLOBAL variable and should be set with SET GLOBAL
SET @@timed_mutexes = 0;
ERROR HY000: Variable 'timed_mutexes' is a GLOBAL variable and should be set with SET GLOBAL
SET @@local.timed_mutexes = 0;
ERROR HY000: Variable 'timed_mutexes' is a GLOBAL variable and should be set with SET GLOBAL
SELECT @@session.timed_mutexes;
ERROR HY000: Variable 'timed_mutexes' is a GLOBAL variable
SELECT @@local.timed_mutexes;
ERROR HY000: Variable 'timed_mutexes' is a GLOBAL variable
'#----------------------FN_DYNVARS_177_06------------------------#'
SELECT count(VARIABLE_VALUE) FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='timed_mutexes';
count(VARIABLE_VALUE)
1
'#----------------------FN_DYNVARS_177_07------------------------#'
SELECT IF(@@global.timed_mutexes, "ON", "OFF") = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='timed_mutexes';
IF(@@global.timed_mutexes, "ON", "OFF") = VARIABLE_VALUE
1
SELECT @@global.timed_mutexes;
@@global.timed_mutexes
1
SELECT VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='timed_mutexes';
VARIABLE_VALUE
ON
'#---------------------FN_DYNVARS_177_08-------------------------#'
SET @@global.timed_mutexes = OFF;
Warnings:
Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release
SELECT @@global.timed_mutexes;
@@global.timed_mutexes
0
SET @@global.timed_mutexes = ON;
Warnings:
Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release
SELECT @@global.timed_mutexes;
@@global.timed_mutexes
1
'#---------------------FN_DYNVARS_177_09----------------------#'
SET @@global.timed_mutexes = TRUE;
Warnings:
Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release
SELECT @@global.timed_mutexes;
@@global.timed_mutexes
1
SET @@global.timed_mutexes = FALSE;
Warnings:
Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release
SELECT @@global.timed_mutexes;
@@global.timed_mutexes
0
SET @@global.timed_mutexes = @global_start_value;
Warnings:
Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release
SELECT @@global.timed_mutexes;
@@global.timed_mutexes
0

18
mysql-test/suite/sys_vars/t/thread_concurrency_basic.test
View file

@ -1,18 +0,0 @@
#
# only global
#
select @@global.thread_concurrency;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
select @@session.thread_concurrency;
show global variables like 'thread_concurrency';
show session variables like 'thread_concurrency';
select * from information_schema.global_variables where variable_name='thread_concurrency';
select * from information_schema.session_variables where variable_name='thread_concurrency';
#
# show that it's read-only
#
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
set global thread_concurrency=1;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
set session thread_concurrency=1;

169
mysql-test/suite/sys_vars/t/timed_mutexes_basic.test
View file

@ -1,169 +0,0 @@
################## mysql-test\t\timed_mutexes_basic.test ######################
# #
# Variable Name: timed_mutexes #
# Scope: GLOBAL #
# Access Type: Dynamic #
# Data Type: boolean #
# Default Value: OFF #
# Valid Values: ON, OFF #
# #
# #
# Creation Date: 2008-02-07 #
# Author: Rizwan #
# #
# Description: Test Cases of Dynamic System Variable timed_mutexes #
# that checks the behavior of this variable in the following ways#
# * Default Value #
# * Valid & Invalid values #
# * Scope & Access method #
# * Data Integrity #
# #
# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
# server-system-variables.html #
# #
###############################################################################
--source include/load_sysvars.inc
########################################################################
# START OF timed_mutexes TESTS #
########################################################################
##############################################################################
# Saving initial value of timed_mutexes in a temporary variable #
##############################################################################
SET @global_start_value = @@global.timed_mutexes;
SELECT @global_start_value;
--echo '#--------------------FN_DYNVARS_177_01------------------------#'
########################################################################
# Display the DEFAULT value of timed_mutexes #
########################################################################
SET @@global.timed_mutexes = 1;
SET @@global.timed_mutexes = DEFAULT;
SELECT @@global.timed_mutexes;
--echo '#---------------------FN_DYNVARS_177_02-------------------------#'
#############################################################################
# Check if timed_mutexes can be accessed with and without @@ sign #
#############################################################################
--Error ER_GLOBAL_VARIABLE
SET timed_mutexes = 1;
SELECT @@timed_mutexes;
--Error ER_UNKNOWN_TABLE
SELECT global.timed_mutexes;
SET global timed_mutexes = 1;
SELECT @@global.timed_mutexes;
--echo '#--------------------FN_DYNVARS_177_03------------------------#'
########################################################################
# Change the value of timed_mutexes to a valid value #
########################################################################
SET @@global.timed_mutexes = 0;
SELECT @@global.timed_mutexes;
SET @@global.timed_mutexes = 1;
SELECT @@global.timed_mutexes;
--echo '#--------------------FN_DYNVARS_177_04-------------------------#'
###########################################################################
# Change the value of timed_mutexes to invalid value #
###########################################################################
--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.timed_mutexes = -1;
--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.timed_mutexes = 2;
--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.timed_mutexes = "T";
--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.timed_mutexes = "Y";
--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.timed_mutexes = _true;
--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.timed_mutexes = 0N;
--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.timed_mutexes = 1+1;
--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.timed_mutexes = 0FF;
--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.timed_mutexes = '0';
--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.timed_mutexes = N;
--echo '#-------------------FN_DYNVARS_177_05----------------------------#'
###########################################################################
# Test if accessing session timed_mutexes gives error #
###########################################################################
--Error ER_GLOBAL_VARIABLE
SET @@session.timed_mutexes = 0;
--Error ER_GLOBAL_VARIABLE
SET @@timed_mutexes = 0;
--Error ER_GLOBAL_VARIABLE
SET @@local.timed_mutexes = 0;
--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT @@session.timed_mutexes;
--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT @@local.timed_mutexes;
--echo '#----------------------FN_DYNVARS_177_06------------------------#'
#########################################################################
# Check if the value in SESSION Table contains variable value #
#########################################################################
SELECT count(VARIABLE_VALUE) FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='timed_mutexes';
--echo '#----------------------FN_DYNVARS_177_07------------------------#'
#########################################################################
# Check if the value in GLOBAL Table matches value in variable #
#########################################################################
SELECT IF(@@global.timed_mutexes, "ON", "OFF") = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='timed_mutexes';
SELECT @@global.timed_mutexes;
SELECT VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='timed_mutexes';
--echo '#---------------------FN_DYNVARS_177_08-------------------------#'
###################################################################
# Check if ON and OFF values can be used on variable #
###################################################################
SET @@global.timed_mutexes = OFF;
SELECT @@global.timed_mutexes;
SET @@global.timed_mutexes = ON;
SELECT @@global.timed_mutexes;
--echo '#---------------------FN_DYNVARS_177_09----------------------#'
###################################################################
# Check if TRUE and FALSE values can be used on variable #
###################################################################
SET @@global.timed_mutexes = TRUE;
SELECT @@global.timed_mutexes;
SET @@global.timed_mutexes = FALSE;
SELECT @@global.timed_mutexes;
##############################
# Restore initial value #
##############################
SET @@global.timed_mutexes = @global_start_value;
SELECT @@global.timed_mutexes;
###############################################################
# END OF timed_mutexes TESTS #
###############################################################

1
mysys/my_static.c
View file

@ -23,7 +23,6 @@
#include "my_static.h" #include "my_static.h"
#include "my_alarm.h" #include "my_alarm.h"
my_bool timed_mutexes= 0;
/* from my_init */ /* from my_init */
char * home_dir=0; char * home_dir=0;

1
plugin/feedback/feedback.cc
View file

@ -184,7 +184,6 @@ static LEX_STRING vars_filter[]= {
{C_STRING_WITH_LEN("table_open_cache")}, {C_STRING_WITH_LEN("table_open_cache")},
{C_STRING_WITH_LEN("thread_handling")}, {C_STRING_WITH_LEN("thread_handling")},
{C_STRING_WITH_LEN("time_zone")}, {C_STRING_WITH_LEN("time_zone")},
{C_STRING_WITH_LEN("timed_mutexes")},
{C_STRING_WITH_LEN("version%")}, {C_STRING_WITH_LEN("version%")},
{0, 0} {0, 0}
}; };

6
sql/mysqld.cc
View file

@ -459,7 +459,7 @@ Atomic_counter<uint32_t> thread_count;
bool shutdown_wait_for_slaves; bool shutdown_wait_for_slaves;
int32 slave_open_temp_tables; int32 slave_open_temp_tables;
ulong thread_created; ulong thread_created;
ulong back_log, connect_timeout, concurrency, server_id; ulong back_log, connect_timeout, server_id;
ulong what_to_log; ulong what_to_log;
ulong slow_launch_time; ulong slow_launch_time;
ulong open_files_limit, max_binlog_size; ulong open_files_limit, max_binlog_size;
@ -5050,6 +5050,10 @@ static int init_server_components()
compatibility, but do not have any effect otherwise, they behave compatibility, but do not have any effect otherwise, they behave
as if supplied with --loose. Whenever a deprecated option is removed as if supplied with --loose. Whenever a deprecated option is removed
it should be appended here. */ it should be appended here. */
{"thread-concurrency", OPT_DEPRECATED_OPTION, "",
0, 0, 0, GET_NO_ARG, OPT_ARG, 0, 0, 0, 0, 0, 0},
{"timed-mutexes", OPT_DEPRECATED_OPTION, "",
0, 0, 0, GET_NO_ARG, OPT_ARG, 0, 0, 0, 0, 0, 0},
{0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0} {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
}; };
/* /*

24
sql/sys_vars.cc
View file

@ -2863,23 +2863,6 @@ static Sys_var_charptr Sys_socket(
READ_ONLY GLOBAL_VAR(mysqld_unix_port), CMD_LINE(REQUIRED_ARG), READ_ONLY GLOBAL_VAR(mysqld_unix_port), CMD_LINE(REQUIRED_ARG),
IN_FS_CHARSET, DEFAULT(0)); IN_FS_CHARSET, DEFAULT(0));
/*
thread_concurrency is a no-op on all platforms since
MySQL 5.1. It will be removed in the context of
WL#5265
*/
static Sys_var_ulong Sys_thread_concurrency(
"thread_concurrency",
"Permits the application to give the threads system a hint for "
"the desired number of threads that should be run at the same time."
"This variable has no effect, and is deprecated. "
"It will be removed in a future release.",
READ_ONLY GLOBAL_VAR(concurrency),
CMD_LINE(REQUIRED_ARG, OPT_THREAD_CONCURRENCY),
VALID_RANGE(1, 512), DEFAULT(DEFAULT_CONCURRENCY), BLOCK_SIZE(1),
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
DEPRECATED("")); // since 5.5.37
static Sys_var_ulonglong Sys_thread_stack( static Sys_var_ulonglong Sys_thread_stack(
"thread_stack", "The stack size for each thread", "thread_stack", "The stack size for each thread",
READ_ONLY GLOBAL_VAR(my_thread_stack_size), CMD_LINE(REQUIRED_ARG), READ_ONLY GLOBAL_VAR(my_thread_stack_size), CMD_LINE(REQUIRED_ARG),
@ -3894,13 +3877,6 @@ static Sys_var_ulonglong Sys_tmp_disk_table_size(
DEFAULT((ulonglong)~(intptr)0), DEFAULT((ulonglong)~(intptr)0),
BLOCK_SIZE(1)); BLOCK_SIZE(1));
static Sys_var_mybool Sys_timed_mutexes(
"timed_mutexes",
"Specify whether to time mutexes. Deprecated, has no effect.",
GLOBAL_VAR(timed_mutexes), CMD_LINE(OPT_ARG), DEFAULT(0),
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
DEPRECATED("")); // since 5.5.39
static Sys_var_charptr Sys_version( static Sys_var_charptr Sys_version(
"version", "Server version number. It may also include a suffix " "version", "Server version number. It may also include a suffix "
"with configuration or build information. -debug indicates " "with configuration or build information. -debug indicates "

4
sql/upgrade_conf_file.cc
View file

@ -119,7 +119,9 @@ static const char *removed_variables[] =
"rpl_recovery_rank", "rpl_recovery_rank",
"sql_big_tables", "sql_big_tables",
"sql_low_priority_updates", "sql_low_priority_updates",
"sql_max_join_size" "sql_max_join_size",
"thread_concurrency",
"timed_mutexes"
}; };