Followup: BUG#23477773 OPTION TO TURN OFF/ON DEADLOCK CHECKER

Fix innodb_deadlock_detect_basic failure on pb2.

Author: Shaohua Wang

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

@@ -19,42 +19,24 @@ innodb_deadlock_detect	ON
 show session variables like 'innodb_deadlock_detect';
 Variable_name	Value
 innodb_deadlock_detect	ON
-select * from performance_schema.global_variables where variable_name='innodb_deadlock_detect';
-VARIABLE_NAME	VARIABLE_VALUE
-innodb_deadlock_detect	ON
-select * from performance_schema.session_variables where variable_name='innodb_deadlock_detect';
-VARIABLE_NAME	VARIABLE_VALUE
-innodb_deadlock_detect	ON
 set global innodb_deadlock_detect='OFF';
 set session innodb_deadlock_detect='OFF';
 ERROR HY000: Variable 'innodb_deadlock_detect' is a GLOBAL variable and should be set with SET GLOBAL
 select @@global.innodb_deadlock_detect;
 @@global.innodb_deadlock_detect
 0
-select * from performance_schema.global_variables where variable_name='innodb_deadlock_detect';
-VARIABLE_NAME	VARIABLE_VALUE
-innodb_deadlock_detect	OFF
 set @@global.innodb_deadlock_detect=1;
 select @@global.innodb_deadlock_detect;
 @@global.innodb_deadlock_detect
 1
-select * from performance_schema.global_variables where variable_name='innodb_deadlock_detect';
-VARIABLE_NAME	VARIABLE_VALUE
-innodb_deadlock_detect	ON
 set global innodb_deadlock_detect=0;
 select @@global.innodb_deadlock_detect;
 @@global.innodb_deadlock_detect
 0
-select * from performance_schema.global_variables where variable_name='innodb_deadlock_detect';
-VARIABLE_NAME	VARIABLE_VALUE
-innodb_deadlock_detect	OFF
 set @@global.innodb_deadlock_detect='ON';
 select @@global.innodb_deadlock_detect;
 @@global.innodb_deadlock_detect
 1
-select * from performance_schema.global_variables where variable_name='innodb_deadlock_detect';
-VARIABLE_NAME	VARIABLE_VALUE
-innodb_deadlock_detect	ON
 set global innodb_deadlock_detect=1.1;
 ERROR 42000: Incorrect argument type to variable 'innodb_deadlock_detect'
 set global innodb_deadlock_detect=1e1;
@@ -67,9 +49,6 @@ set global innodb_deadlock_detect=-3;
 select @@global.innodb_deadlock_detect;
 @@global.innodb_deadlock_detect
 1
-select * from performance_schema.global_variables where variable_name='innodb_deadlock_detect';
-VARIABLE_NAME	VARIABLE_VALUE
-innodb_deadlock_detect	ON
 SET @@global.innodb_deadlock_detect = @start_global_value;
 SELECT @@global.innodb_deadlock_detect;
 @@global.innodb_deadlock_detect

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

@@ -15,10 +15,6 @@ select @@session.innodb_deadlock_detect in (0, 1);
 select @@session.innodb_deadlock_detect;
 show global variables like 'innodb_deadlock_detect';
 show session variables like 'innodb_deadlock_detect';
---disable_warnings
-select * from performance_schema.global_variables where variable_name='innodb_deadlock_detect';
-select * from performance_schema.session_variables where variable_name='innodb_deadlock_detect';
---enable_warnings
 
 #
 # show that it's writable
@@ -27,24 +23,12 @@ set global innodb_deadlock_detect='OFF';
 --error ER_GLOBAL_VARIABLE
 set session innodb_deadlock_detect='OFF';
 select @@global.innodb_deadlock_detect;
---disable_warnings
-select * from performance_schema.global_variables where variable_name='innodb_deadlock_detect';
---enable_warnings
 set @@global.innodb_deadlock_detect=1;
 select @@global.innodb_deadlock_detect;
---disable_warnings
-select * from performance_schema.global_variables where variable_name='innodb_deadlock_detect';
---enable_warnings
 set global innodb_deadlock_detect=0;
 select @@global.innodb_deadlock_detect;
---disable_warnings
-select * from performance_schema.global_variables where variable_name='innodb_deadlock_detect';
---enable_warnings
 set @@global.innodb_deadlock_detect='ON';
 select @@global.innodb_deadlock_detect;
---disable_warnings
-select * from performance_schema.global_variables where variable_name='innodb_deadlock_detect';
---enable_warnings
 
 #
 # incorrect types
@@ -59,9 +43,6 @@ set global innodb_deadlock_detect=2;
 set global innodb_deadlock_detect='AUTO';
 set global innodb_deadlock_detect=-3;
 select @@global.innodb_deadlock_detect;
---disable_warnings
-select * from performance_schema.global_variables where variable_name='innodb_deadlock_detect';
---enable_warnings
 
 #
 # Cleanup