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

cleanup: @@mutex_deadlock_detector -> @@debug_mutex_deadlock_detector

Browse Source
This commit is contained in:
Sergei Golubchik
2014-09-03 20:16:13 +02:00
parent 15623fd7bb
commit beb2422ad8
6 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/include/have_mutex_deadlock_detector.inc
View File

@ -1,4 +1,3 @@
--require r/have_mutex_deadlock_detector.require if (`select count(*)=0 from information_schema.global_variables where variable_name = "debug_mutex_deadlock_detector"`) {
disable_query_log; skip needs safemutex deadlock detector;
select 1 from information_schema.global_variables where variable_name = "mutex_deadlock_detector"; }
enable_query_log;

2
mysql-test/r/have_mutex_deadlock_detector.require
View File

@ -1,2 +0,0 @@
1
1

21
mysql-test/suite/sys_vars/r/debug_mutex_deadlock_detector_basic.result Normal file
View File

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

21
mysql-test/suite/sys_vars/r/mutex_deadlock_detector_basic.result
View File

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

16
mysql-test/suite/sys_vars/t/mutex_deadlock_detector_basic.test → mysql-test/suite/sys_vars/t/debug_mutex_deadlock_detector_basic.test
View File

@ -5,19 +5,19 @@
# #
# show the global and session values; # show the global and session values;
# #
select @@global.mutex_deadlock_detector; select @@global.debug_mutex_deadlock_detector;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR --error ER_INCORRECT_GLOBAL_LOCAL_VAR
select @@session.mutex_deadlock_detector; select @@session.debug_mutex_deadlock_detector;
show global variables like 'mutex_deadlock_detector'; show global variables like 'debug_mutex_deadlock_detector';
show session variables like 'mutex_deadlock_detector'; show session variables like 'debug_mutex_deadlock_detector';
select * from information_schema.global_variables where variable_name='mutex_deadlock_detector'; select * from information_schema.global_variables where variable_name='debug_mutex_deadlock_detector';
select * from information_schema.session_variables where variable_name='mutex_deadlock_detector'; select * from information_schema.session_variables where variable_name='debug_mutex_deadlock_detector';
# #
# show that it's read-only # show that it's read-only
# #
--error ER_INCORRECT_GLOBAL_LOCAL_VAR --error ER_INCORRECT_GLOBAL_LOCAL_VAR
set global mutex_deadlock_detector=1; set global debug_mutex_deadlock_detector=1;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR --error ER_INCORRECT_GLOBAL_LOCAL_VAR
set session mutex_deadlock_detector=1; set session debug_mutex_deadlock_detector=1;

2
sql/sys_vars.cc
View File

@ -4810,7 +4810,7 @@ static Sys_var_ulong Sys_extra_max_connections(
#ifdef SAFE_MUTEX #ifdef SAFE_MUTEX
static Sys_var_mybool Sys_mutex_deadlock_detector( static Sys_var_mybool Sys_mutex_deadlock_detector(
"mutex_deadlock_detector", "Enable checking of wrong mutex usage", "debug_mutex_deadlock_detector", "Enable checking of wrong mutex usage",
READ_ONLY GLOBAL_VAR(safe_mutex_deadlock_detector), READ_ONLY GLOBAL_VAR(safe_mutex_deadlock_detector),
CMD_LINE(OPT_ARG), DEFAULT(TRUE)); CMD_LINE(OPT_ARG), DEFAULT(TRUE));
#endif #endif