Skip to content

Commit 802cd3b

Browse files
committed
WL#7436: Deprecate and remove timed_mutexes system variable
This is the 5.7 version of the patch. Remove the timed_mutexes system variable.
2 parents 8adac44 + 2c82605 commit 802cd3b

File tree

9 files changed

+0
-310
lines changed

9 files changed

+0
-310
lines changed

include/my_sys.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,6 @@ extern my_bool my_disable_locking, my_disable_async_io,
265265
extern char wild_many,wild_one,wild_prefix;
266266
extern const char *charsets_dir;
267267

268-
extern my_bool timed_mutexes;
269-
270268
enum cache_type
271269
{
272270
TYPE_NOT_SET= 0, READ_CACHE, WRITE_CACHE,

mysql-test/r/mysqld--help-notwin.result

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,8 +1028,6 @@ The following options may be given as the first argument:
10281028
one-thread-per-connection, no-threads, loaded-dynamically
10291029
--thread-stack=# The stack size for each thread
10301030
--time-format=name The TIME format (ignored)
1031-
--timed-mutexes Specify whether to time mutexes (only InnoDB mutexes are
1032-
currently supported)
10331031
--tmp-table-size=# If an internal in-memory temporary table exceeds this
10341032
size, MySQL will automatically convert it to an on-disk
10351033
MyISAM table
@@ -1362,7 +1360,6 @@ thread-cache-size 9
13621360
thread-handling one-thread-per-connection
13631361
thread-stack 262144
13641362
time-format %H:%i:%s
1365-
timed-mutexes FALSE
13661363
tmp-table-size 16777216
13671364
transaction-alloc-block-size 8192
13681365
transaction-isolation REPEATABLE-READ

mysql-test/r/mysqld--help-win.result

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,8 +1036,6 @@ The following options may be given as the first argument:
10361036
one-thread-per-connection, no-threads, loaded-dynamically
10371037
--thread-stack=# The stack size for each thread
10381038
--time-format=name The TIME format (ignored)
1039-
--timed-mutexes Specify whether to time mutexes (only InnoDB mutexes are
1040-
currently supported)
10411039
--tmp-table-size=# If an internal in-memory temporary table exceeds this
10421040
size, MySQL will automatically convert it to an on-disk
10431041
MyISAM table
@@ -1373,7 +1371,6 @@ thread-cache-size 9
13731371
thread-handling one-thread-per-connection
13741372
thread-stack 262144
13751373
time-format %H:%i:%s
1376-
timed-mutexes FALSE
13771374
tmp-table-size 16777216
13781375
transaction-alloc-block-size 8192
13791376
transaction-isolation REPEATABLE-READ

mysql-test/r/variables.result

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -198,20 +198,6 @@ set global concurrent_insert=DEFAULT;
198198
select @@concurrent_insert;
199199
@@concurrent_insert
200200
AUTO
201-
set global timed_mutexes=ON;
202-
show variables like 'timed_mutexes';
203-
Variable_name Value
204-
timed_mutexes ON
205-
select * from information_schema.session_variables where variable_name like 'timed_mutexes';
206-
VARIABLE_NAME VARIABLE_VALUE
207-
TIMED_MUTEXES ON
208-
set global timed_mutexes=0;
209-
show variables like 'timed_mutexes';
210-
Variable_name Value
211-
timed_mutexes OFF
212-
select * from information_schema.session_variables where variable_name like 'timed_mutexes';
213-
VARIABLE_NAME VARIABLE_VALUE
214-
TIMED_MUTEXES OFF
215201
set default_storage_engine=MYISAM, default_storage_engine="HEAP", global default_storage_engine="MERGE";
216202
show local variables like 'default_storage_engine';
217203
Variable_name Value

mysql-test/suite/sys_vars/r/timed_mutexes_basic.result

Lines changed: 0 additions & 104 deletions
This file was deleted.

mysql-test/suite/sys_vars/t/timed_mutexes_basic.test

Lines changed: 0 additions & 169 deletions
This file was deleted.

mysql-test/t/variables.test

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,6 @@ select * from information_schema.session_variables where variable_name like 'con
130130
set global concurrent_insert=DEFAULT;
131131
select @@concurrent_insert;
132132

133-
set global timed_mutexes=ON;
134-
show variables like 'timed_mutexes';
135-
select * from information_schema.session_variables where variable_name like 'timed_mutexes';
136-
set global timed_mutexes=0;
137-
show variables like 'timed_mutexes';
138-
select * from information_schema.session_variables where variable_name like 'timed_mutexes';
139-
140133
set default_storage_engine=MYISAM, default_storage_engine="HEAP", global default_storage_engine="MERGE";
141134
show local variables like 'default_storage_engine';
142135
select * from information_schema.session_variables where variable_name like 'default_storage_engine';

mysys/my_static.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ PSI_memory_key key_memory_win_PACL;
5151
PSI_memory_key key_memory_win_IP_ADAPTER_ADDRESSES;
5252
#endif /* _WIN32 */
5353

54-
my_bool timed_mutexes= 0;
55-
5654
/* from my_init */
5755
char * home_dir=0;
5856
const char *my_progname=0;

sql/sys_vars.cc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3349,12 +3349,6 @@ static Sys_var_ulonglong Sys_tmp_table_size(
33493349
VALID_RANGE(1024, (ulonglong)~(intptr)0), DEFAULT(16*1024*1024),
33503350
BLOCK_SIZE(1));
33513351

3352-
static Sys_var_mybool Sys_timed_mutexes(
3353-
"timed_mutexes",
3354-
"Specify whether to time mutexes (only InnoDB mutexes are currently "
3355-
"supported)",
3356-
GLOBAL_VAR(timed_mutexes), CMD_LINE(OPT_ARG), DEFAULT(0));
3357-
33583352
static char *server_version_ptr;
33593353
static Sys_var_charptr Sys_version(
33603354
"version", "Server version",

0 commit comments

Comments
 (0)