Merge 10.7 into 10.8

4 files changed, 0 insertions, 187 deletions

diff --git a/mysql-test/suite/sys_vars/r/innodb_disable_resize_buffer_pool_debug_basic.result b/mysql-test/suite/sys_vars/r/innodb_disable_resize_buffer_pool_debug_basic.result
deleted file mode 100644
index bbac9a4cde6..00000000000
--- a/mysql-test/suite/sys_vars/r/innodb_disable_resize_buffer_pool_debug_basic.result
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Basic test for innodb_disable_resize_buffer_pool_debug
-#
-SET @start_global_value = @@global.innodb_disable_resize_buffer_pool_debug;
-SET @@global.innodb_disable_resize_buffer_pool_debug = 0;
-SELECT @@global.innodb_disable_resize_buffer_pool_debug;
-@@global.innodb_disable_resize_buffer_pool_debug
-0
-SET @@global.innodb_disable_resize_buffer_pool_debug ='On' ;
-SELECT @@global.innodb_disable_resize_buffer_pool_debug;
-@@global.innodb_disable_resize_buffer_pool_debug
-1
-SET @@global.innodb_disable_resize_buffer_pool_debug ='Off' ;
-SELECT @@global.innodb_disable_resize_buffer_pool_debug;
-@@global.innodb_disable_resize_buffer_pool_debug
-0
-SET @@global.innodb_disable_resize_buffer_pool_debug = 1;
-SELECT @@global.innodb_disable_resize_buffer_pool_debug;
-@@global.innodb_disable_resize_buffer_pool_debug
-1
-SELECT IF(@@GLOBAL.innodb_disable_resize_buffer_pool_debug,'ON','OFF') = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_disable_resize_buffer_pool_debug';
-IF(@@GLOBAL.innodb_disable_resize_buffer_pool_debug,'ON','OFF') = VARIABLE_VALUE
-1
-1 Expected
-SELECT COUNT(@@GLOBAL.innodb_disable_resize_buffer_pool_debug);
-COUNT(@@GLOBAL.innodb_disable_resize_buffer_pool_debug)
-1
-1 Expected
-SELECT COUNT(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_disable_resize_buffer_pool_debug';
-COUNT(VARIABLE_VALUE)
-1
-1 Expected
-SELECT @@innodb_disable_resize_buffer_pool_debug = @@GLOBAL.innodb_disable_resize_buffer_pool_debug;
-@@innodb_disable_resize_buffer_pool_debug = @@GLOBAL.innodb_disable_resize_buffer_pool_debug
-1
-1 Expected
-SELECT COUNT(@@innodb_disable_resize_buffer_pool_debug);
-COUNT(@@innodb_disable_resize_buffer_pool_debug)
-1
-1 Expected
-SELECT COUNT(@@local.innodb_disable_resize_buffer_pool_debug);
-ERROR HY000: Variable 'innodb_disable_resize_buffer_pool_debug' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT COUNT(@@SESSION.innodb_disable_resize_buffer_pool_debug);
-ERROR HY000: Variable 'innodb_disable_resize_buffer_pool_debug' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT COUNT(@@GLOBAL.innodb_disable_resize_buffer_pool_debug);
-COUNT(@@GLOBAL.innodb_disable_resize_buffer_pool_debug)
-1
-1 Expected
-SELECT innodb_disable_resize_buffer_pool_debug = @@SESSION.innodb_disable_resize_buffer_pool_debug;
-ERROR 42S22: Unknown column 'innodb_disable_resize_buffer_pool_debug' in 'field list'
-SET @@global.innodb_disable_resize_buffer_pool_debug = @start_global_value;
-SELECT @@global.innodb_disable_resize_buffer_pool_debug;
-@@global.innodb_disable_resize_buffer_pool_debug
-1
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
index a893bd007dd..177a27925e6 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
@@ -513,30 +513,6 @@ NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	INNODB_DICT_STATS_DISABLED_DEBUG
-SESSION_VALUE	NULL
-DEFAULT_VALUE	OFF
-VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Disable dict_stats thread
-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	INNODB_DISABLE_RESIZE_BUFFER_POOL_DEBUG
-SESSION_VALUE	NULL
-DEFAULT_VALUE	ON
-VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Disable resizing buffer pool to make assertion code not expensive.
-NUMERIC_MIN_VALUE	NULL
-NUMERIC_MAX_VALUE	NULL
-NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	OFF,ON
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	NONE
 VARIABLE_NAME	INNODB_DISABLE_SORT_FILE_CACHE
 SESSION_VALUE	NULL
 DEFAULT_VALUE	OFF
@@ -1089,18 +1065,6 @@ NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	INNODB_MASTER_THREAD_DISABLED_DEBUG
-SESSION_VALUE	NULL
-DEFAULT_VALUE	OFF
-VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Disable master thread
-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	INNODB_MAX_DIRTY_PAGES_PCT
 SESSION_VALUE	NULL
 DEFAULT_VALUE	90.000000
@@ -1293,18 +1257,6 @@ NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	OFF,ON
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	NONE
-VARIABLE_NAME	INNODB_PAGE_CLEANER_DISABLED_DEBUG
-SESSION_VALUE	NULL
-DEFAULT_VALUE	OFF
-VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Disable page cleaner
-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	INNODB_PAGE_SIZE
 SESSION_VALUE	NULL
 DEFAULT_VALUE	16384
diff --git a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_size_basic.test b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_size_basic.test
index 4dd4a3aba0a..f37e3e2e0fd 100644
--- a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_size_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_size_basic.test
@@ -24,13 +24,6 @@
 
 --source include/have_innodb.inc
 
---disable_query_log
-if (`select (version() like '%debug%') > 0`)
-{
-    set global innodb_disable_resize_buffer_pool_debug = OFF;
-}
---enable_query_log
-
 let $wait_condition =
   SELECT SUBSTR(variable_value, 1, 34) = 'Completed resizing buffer pool at '
   FROM information_schema.global_status
diff --git a/mysql-test/suite/sys_vars/t/innodb_disable_resize_buffer_pool_debug_basic.test b/mysql-test/suite/sys_vars/t/innodb_disable_resize_buffer_pool_debug_basic.test
deleted file mode 100644
index e381e746c06..00000000000
--- a/mysql-test/suite/sys_vars/t/innodb_disable_resize_buffer_pool_debug_basic.test
+++ /dev/null
@@ -1,72 +0,0 @@
---echo #
---echo # Basic test for innodb_disable_resize_buffer_pool_debug
---echo #
-
---source include/have_innodb.inc
-
-# The config variable is a debug variable
--- source include/have_debug.inc
-
-SET @start_global_value = @@global.innodb_disable_resize_buffer_pool_debug;
-
-# Check if Value can set
-
-SET @@global.innodb_disable_resize_buffer_pool_debug = 0;
-SELECT @@global.innodb_disable_resize_buffer_pool_debug;
-
-SET @@global.innodb_disable_resize_buffer_pool_debug ='On' ;
-SELECT @@global.innodb_disable_resize_buffer_pool_debug;
-
-SET @@global.innodb_disable_resize_buffer_pool_debug ='Off' ;
-SELECT @@global.innodb_disable_resize_buffer_pool_debug;
-
-SET @@global.innodb_disable_resize_buffer_pool_debug = 1;
-SELECT @@global.innodb_disable_resize_buffer_pool_debug;
-
-# Check if the value in GLOBAL Table matches value in variable
-
---disable_warnings
-SELECT IF(@@GLOBAL.innodb_disable_resize_buffer_pool_debug,'ON','OFF') = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_disable_resize_buffer_pool_debug';
---enable_warnings
---echo 1 Expected
-
-SELECT COUNT(@@GLOBAL.innodb_disable_resize_buffer_pool_debug);
---echo 1 Expected
-
---disable_warnings
-SELECT COUNT(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_disable_resize_buffer_pool_debug';
---enable_warnings
---echo 1 Expected
-
-# Check if accessing variable with and without GLOBAL point to same variable
-
-SELECT @@innodb_disable_resize_buffer_pool_debug = @@GLOBAL.innodb_disable_resize_buffer_pool_debug;
---echo 1 Expected
-
-# Check if innodb_disable_resize_buffer_pool_debug can be accessed with and without @@ sign
-
-SELECT COUNT(@@innodb_disable_resize_buffer_pool_debug);
---echo 1 Expected
-
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT COUNT(@@local.innodb_disable_resize_buffer_pool_debug);
---echo Expected error 'Variable is a GLOBAL variable'
-
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT COUNT(@@SESSION.innodb_disable_resize_buffer_pool_debug);
---echo Expected error 'Variable is a GLOBAL variable'
-
-SELECT COUNT(@@GLOBAL.innodb_disable_resize_buffer_pool_debug);
---echo 1 Expected
-
---Error ER_BAD_FIELD_ERROR
-SELECT innodb_disable_resize_buffer_pool_debug = @@SESSION.innodb_disable_resize_buffer_pool_debug;
-
-# Cleanup
-
-SET @@global.innodb_disable_resize_buffer_pool_debug = @start_global_value;
-SELECT @@global.innodb_disable_resize_buffer_pool_debug;