mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Delete unused global variables from mysqld.h
Several variables declared in mysqld.h appear to be old system variables that have been left over after deprecation. Delete them using IDE refactoring to automatically search for other uses. Most cases had no other uses in the code. slave_allow_batching had a test that was effectively unused, as the result was only -ERROR HY000: Unknown system variable 'slave_allow_batching' so that was deleted as well. Build and test still works without issue as expected. All new code of the whole pull request, including one or several files that are either new files or modified ones, are contributed under the BSD-new license. I am contributing on behalf of my employer Amazon Web Services.
This commit is contained in:
Robin Newhouse
committed by
Andrew Hutchings
Andrew Hutchings
parent
7c5fdc9b6a
commit
becc8372c7
@@ -1,165 +0,0 @@
|
||||
############## mysql-test\t\slave_allow_batching_basic.test ####################
|
||||
# #
|
||||
# Variable Name: slave_allow_batching #
|
||||
# Scope: GLOBAL & SESSION #
|
||||
# Access Type: Dynamic #
|
||||
# Data Type: Numeric #
|
||||
# Default Value: 1 #
|
||||
# Range: 1 - 65536 #
|
||||
# #
|
||||
# #
|
||||
# Creation Date: 2008-02-07 #
|
||||
# Author: Rizwan Maredia #
|
||||
# #
|
||||
# Description: Test Cases of Dynamic System Variable slave_allow_batching #
|
||||
# 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 slave_allow_batching TESTS #
|
||||
########################################################################
|
||||
|
||||
|
||||
################################################################################
|
||||
# Saving initial value of slave_allow_batching in a temporary variable #
|
||||
################################################################################
|
||||
|
||||
--Error ER_UNKNOWN_SYSTEM_VARIABLE
|
||||
SET @global_start_value = @@global.slave_allow_batching;
|
||||
|
||||
--echo '#--------------------FN_DYNVARS_145_01------------------------#'
|
||||
########################################################################
|
||||
# Display the DEFAULT value of slave_allow_batching #
|
||||
########################################################################
|
||||
|
||||
#SET @@global.slave_allow_batching = 1;
|
||||
#SET @@global.slave_allow_batching = DEFAULT;
|
||||
#SELECT @@global.slave_allow_batching;
|
||||
|
||||
--echo '#---------------------FN_DYNVARS_145_02-------------------------#'
|
||||
#############################################################################
|
||||
# Check if slave_allow_batching can be accessed with and without @@ sign #
|
||||
#############################################################################
|
||||
|
||||
#--Error ER_GLOBAL_VARIABLE
|
||||
#SET slave_allow_batching = 1;
|
||||
#SELECT @@slave_allow_batching;
|
||||
#--Error ER_UNKNOWN_TABLE
|
||||
#SELECT global.slave_allow_batching;
|
||||
#
|
||||
#SET global slave_allow_batching = 1;
|
||||
#SELECT @@global.slave_allow_batching;
|
||||
|
||||
|
||||
--echo '#--------------------FN_DYNVARS_145_03------------------------#'
|
||||
########################################################################
|
||||
# Change the value of slave_allow_batching to a valid value #
|
||||
########################################################################
|
||||
|
||||
#SET @@global.slave_allow_batching = 0;
|
||||
#SELECT @@global.slave_allow_batching;
|
||||
#SET @@global.slave_allow_batching = 1;
|
||||
#SELECT @@global.slave_allow_batching;
|
||||
|
||||
|
||||
--echo '#--------------------FN_DYNVARS_145_04-------------------------#'
|
||||
###########################################################################
|
||||
# Change the value of slave_allow_batching to invalid value #
|
||||
###########################################################################
|
||||
|
||||
#--Error ER_WRONG_VALUE_FOR_VAR
|
||||
#SET @@global.slave_allow_batching = -1;
|
||||
#--Error ER_WRONG_VALUE_FOR_VAR
|
||||
#SET @@global.slave_allow_batching = 2;
|
||||
#--Error ER_WRONG_VALUE_FOR_VAR
|
||||
#SET @@global.slave_allow_batching = "T";
|
||||
#--Error ER_WRONG_VALUE_FOR_VAR
|
||||
#SET @@global.slave_allow_batching = "Y";
|
||||
#--Error ER_WRONG_VALUE_FOR_VAR
|
||||
#SET @@global.slave_allow_batching = YES;
|
||||
#--Error ER_WRONG_VALUE_FOR_VAR
|
||||
#SET @@global.slave_allow_batching = ONN;
|
||||
#--Error ER_WRONG_VALUE_FOR_VAR
|
||||
#SET @@global.slave_allow_batching = OOF;
|
||||
#--Error ER_WRONG_VALUE_FOR_VAR
|
||||
#SET @@global.slave_allow_batching = 0FF;
|
||||
#--Error ER_WRONG_VALUE_FOR_VAR
|
||||
#SET @@global.slave_allow_batching = ' 1';
|
||||
#--Error ER_WRONG_VALUE_FOR_VAR
|
||||
#SET @@global.slave_allow_batching = NO;
|
||||
|
||||
|
||||
--echo '#-------------------FN_DYNVARS_145_05----------------------------#'
|
||||
###########################################################################
|
||||
# Test if accessing session slave_allow_batching gives error #
|
||||
###########################################################################
|
||||
|
||||
#--Error ER_GLOBAL_VARIABLE
|
||||
#SET @@session.slave_allow_batching = 0;
|
||||
#--Error ER_GLOBAL_VARIABLE
|
||||
#SET @@slave_allow_batching = 0;
|
||||
#--Error ER_GLOBAL_VARIABLE
|
||||
#SET @@local.slave_allow_batching = 0;
|
||||
#--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
|
||||
#SELECT @@session.slave_allow_batching;
|
||||
#--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
|
||||
#SELECT @@local.slave_allow_batching;
|
||||
|
||||
--echo '#----------------------FN_DYNVARS_145_06------------------------#'
|
||||
#########################################################################
|
||||
# Check if the value in SESSION Table contains variable value #
|
||||
#########################################################################
|
||||
|
||||
#SELECT count(VARIABLE_VALUE) FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='slave_allow_batching';
|
||||
|
||||
|
||||
--echo '#----------------------FN_DYNVARS_145_07------------------------#'
|
||||
#########################################################################
|
||||
# Check if the value in GLOBAL Table matches value in variable #
|
||||
#########################################################################
|
||||
|
||||
#SELECT IF(@@global.slave_allow_batching, "ON", "OFF") = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='slave_allow_batching';
|
||||
#SELECT @@global.slave_allow_batching;
|
||||
#SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='slave_allow_batching';
|
||||
#--echo 'Bug: value in information schema does not match'
|
||||
|
||||
--echo '#---------------------FN_DYNVARS_145_08-------------------------#'
|
||||
###################################################################
|
||||
# Check if ON and OFF values can be used on variable #
|
||||
###################################################################
|
||||
|
||||
#SET @@global.slave_allow_batching = OFF;
|
||||
#SELECT @@global.slave_allow_batching;
|
||||
#SET @@global.slave_allow_batching = ON;
|
||||
#SELECT @@global.slave_allow_batching;
|
||||
|
||||
--echo '#---------------------FN_DYNVARS_145_09----------------------#'
|
||||
###################################################################
|
||||
# Check if TRUE and FALSE values can be used on variable #
|
||||
###################################################################
|
||||
|
||||
#SET @@global.slave_allow_batching = TRUE;
|
||||
#SELECT @@global.slave_allow_batching;
|
||||
#SET @@global.slave_allow_batching = FALSE;
|
||||
#SELECT @@global.slave_allow_batching;
|
||||
|
||||
##############################
|
||||
# Restore initial value #
|
||||
##############################
|
||||
|
||||
#SET @@global.slave_allow_batching = @global_start_value;
|
||||
#SELECT @@global.slave_allow_batching;
|
||||
|
||||
###############################################################
|
||||
# END OF slave_allow_batching TESTS #
|
||||
###############################################################
|
||||
Reference in New Issue
Block a user