From: Date: July 23 2008 5:56pm Subject: bzr commit into mysql-6.0-backup branch (horst:2743) Bug#36522 List-Archive: http://lists.mysql.com/commits/50347 X-Bug: 36522 Message-Id: <200807231556.m6NFureV018530@hh-nb.hungers> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///work/bzr/6.0-clean/ 2743 Horst Hunger 2008-07-23 Postfix of merge 5.1 - 6.0 for Bug#36522:Removed "multi_range_count" tests as this system variable doesn't exist anymore. removed: mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test === removed file 'mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc' --- a/mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc 2008-07-23 15:40:59 +0000 +++ b/mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc 1970-01-01 00:00:00 +0000 @@ -1,219 +0,0 @@ -############## mysql-test\t\multi_range_count_basic.test ############### -# # -# Variable Name: multi_range_count # -# Scope: GLOBAL | SESSION # -# Access Type: Dynamic # -# Data Type: numeric # -# Default Value: 256 # -# Range:1-4294967295 # -# # -# # -# Creation Date: 2008-02-07 # -# Author: Salman # -# # -# Description: Test Cases of Dynamic System Variable multi_range_count # -# 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 multi_range_count TESTS # -################################################################# - - -############################################################# -# Save initial value # -############################################################# - -SET @start_global_value = @@global.multi_range_count; -SELECT @start_global_value; -SET @start_session_value = @@session.multi_range_count; -SELECT @start_session_value; - - ---echo '#--------------------FN_DYNVARS_090_01-------------------------#' -################################################################# -# Display the DEFAULT value of multi_range_count # -################################################################# - -SET @@global.multi_range_count = 100; -SET @@global.multi_range_count = DEFAULT; -SELECT @@global.multi_range_count; - -SET @@session.multi_range_count = 200; -SET @@session.multi_range_count = DEFAULT; -SELECT @@session.multi_range_count; - - ---echo '#--------------------FN_DYNVARS_090_02-------------------------#' -################################################################# -# Check the DEFAULT value of multi_range_count # -################################################################# - -SET @@global.multi_range_count = DEFAULT; -SELECT @@global.multi_range_count = 256; - -SET @@session.multi_range_count = DEFAULT; -SELECT @@session.multi_range_count = 256; - - ---echo '#--------------------FN_DYNVARS_090_03-------------------------#' -########################################################################### -# Change the value of multi_range_count to a valid value for GLOBAL Scope # -########################################################################### - -SET @@global.multi_range_count = 1; -SELECT @@global.multi_range_count; -SET @@global.multi_range_count = 60020; -SELECT @@global.multi_range_count; -SET @@global.multi_range_count = 65535; -SELECT @@global.multi_range_count; -SET @@global.multi_range_count = 4294967295; -SELECT @@global.multi_range_count; -SET @@global.multi_range_count = 4294967294; -SELECT @@global.multi_range_count; - - - ---echo '#--------------------FN_DYNVARS_090_04-------------------------#' -############################################################################ -# Change the value of multi_range_count to a valid value for SESSION Scope # -############################################################################ - -SET @@session.multi_range_count = 1; -SELECT @@session.multi_range_count; -SET @@session.multi_range_count = 50050; -SELECT @@session.multi_range_count; -SET @@session.multi_range_count = 65535; -SELECT @@session.multi_range_count; -SET @@session.multi_range_count = 4294967295; -SELECT @@session.multi_range_count; -SET @@session.multi_range_count = 4294967294; -SELECT @@session.multi_range_count; - - ---echo '#------------------FN_DYNVARS_090_05-----------------------#' -############################################################# -# Change the value of multi_range_count to an invalid value # -############################################################# - -SET @@global.multi_range_count = 0; -SELECT @@global.multi_range_count; -SET @@global.multi_range_count = 4294967296; -SELECT @@global.multi_range_count; -SET @@global.multi_range_count = -1024; -SELECT @@global.multi_range_count; -SET @@global.multi_range_count = 429496729500; -SELECT @@global.multi_range_count; ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.multi_range_count = 65530.34; -SELECT @@global.multi_range_count; ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.multi_range_count = test; -SELECT @@global.multi_range_count; - -SET @@session.multi_range_count = 0; -SELECT @@session.multi_range_count; -SET @@session.multi_range_count = 4294967296; -SELECT @@session.multi_range_count; -SET @@session.multi_range_count = -1; -SELECT @@session.multi_range_count; ---Error ER_PARSE_ERROR -SET @@session.multi_range_count = 65530.34.; -SET @@session.multi_range_count = 4294967295021; -SELECT @@session.multi_range_count; ---echo 'Bug # 34837: Errors are not coming on assigning invalid values to variable'; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@session.multi_range_count = test; -SELECT @@session.multi_range_count; - - ---echo '#------------------FN_DYNVARS_090_06-----------------------#' -#################################################################### -# Check if the value in GLOBAL Table matches value in variable # -#################################################################### - - -SELECT @@global.multi_range_count = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='multi_range_count'; - ---echo '#------------------FN_DYNVARS_090_07-----------------------#' -#################################################################### -# Check if the value in SESSION Table matches value in variable # -#################################################################### - -SELECT @@session.multi_range_count = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='multi_range_count'; - - ---echo '#------------------FN_DYNVARS_090_08-----------------------#' -#################################################################### -# Check if TRUE and FALSE values can be used on variable # -#################################################################### - -SET @@global.multi_range_count = TRUE; -SELECT @@global.multi_range_count; -SET @@global.multi_range_count = FALSE; -SELECT @@global.multi_range_count; - - ---echo '#---------------------FN_DYNVARS_090_09----------------------#' -################################################################################# -# Check if accessing variable with and without GLOBAL point to same variable # -################################################################################# - -SET @@global.multi_range_count = 10; -SELECT @@multi_range_count = @@global.multi_range_count; - - ---echo '#---------------------FN_DYNVARS_090_10----------------------#' -######################################################################################################## -# Check if accessing variable with SESSION,LOCAL and without SCOPE points to same session variable # -######################################################################################################## - -SET @@multi_range_count = 100; -SELECT @@multi_range_count = @@local.multi_range_count; -SELECT @@local.multi_range_count = @@session.multi_range_count; - - ---echo '#---------------------FN_DYNVARS_090_11----------------------#' -############################################################################ -# Check if multi_range_count can be accessed with and without @@ sign # -############################################################################ - -SET multi_range_count = 1; -SELECT @@multi_range_count; ---Error ER_UNKNOWN_TABLE -SELECT local.multi_range_count; ---Error ER_UNKNOWN_TABLE -SELECT session.multi_range_count; ---Error ER_BAD_FIELD_ERROR -SELECT multi_range_count = @@session.multi_range_count; - - -#################################### -# Restore initial value # -#################################### - -SET @@global.multi_range_count = @start_global_value; -SELECT @@global.multi_range_count; -SET @@session.multi_range_count = @start_session_value; -SELECT @@session.multi_range_count; - - -###################################################### -# END OF multi_range_count TESTS # -###################################################### - === removed file 'mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result' --- a/mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result 2008-07-23 15:40:59 +0000 +++ b/mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result 1970-01-01 00:00:00 +0000 @@ -1,192 +0,0 @@ -SET @start_global_value = @@global.multi_range_count; -SELECT @start_global_value; -@start_global_value -256 -SET @start_session_value = @@session.multi_range_count; -SELECT @start_session_value; -@start_session_value -256 -'#--------------------FN_DYNVARS_090_01-------------------------#' -SET @@global.multi_range_count = 100; -SET @@global.multi_range_count = DEFAULT; -SELECT @@global.multi_range_count; -@@global.multi_range_count -256 -SET @@session.multi_range_count = 200; -SET @@session.multi_range_count = DEFAULT; -SELECT @@session.multi_range_count; -@@session.multi_range_count -256 -'#--------------------FN_DYNVARS_090_02-------------------------#' -SET @@global.multi_range_count = DEFAULT; -SELECT @@global.multi_range_count = 256; -@@global.multi_range_count = 256 -1 -SET @@session.multi_range_count = DEFAULT; -SELECT @@session.multi_range_count = 256; -@@session.multi_range_count = 256 -1 -'#--------------------FN_DYNVARS_090_03-------------------------#' -SET @@global.multi_range_count = 1; -SELECT @@global.multi_range_count; -@@global.multi_range_count -1 -SET @@global.multi_range_count = 60020; -SELECT @@global.multi_range_count; -@@global.multi_range_count -60020 -SET @@global.multi_range_count = 65535; -SELECT @@global.multi_range_count; -@@global.multi_range_count -65535 -SET @@global.multi_range_count = 4294967295; -SELECT @@global.multi_range_count; -@@global.multi_range_count -4294967295 -SET @@global.multi_range_count = 4294967294; -SELECT @@global.multi_range_count; -@@global.multi_range_count -4294967294 -'#--------------------FN_DYNVARS_090_04-------------------------#' -SET @@session.multi_range_count = 1; -SELECT @@session.multi_range_count; -@@session.multi_range_count -1 -SET @@session.multi_range_count = 50050; -SELECT @@session.multi_range_count; -@@session.multi_range_count -50050 -SET @@session.multi_range_count = 65535; -SELECT @@session.multi_range_count; -@@session.multi_range_count -65535 -SET @@session.multi_range_count = 4294967295; -SELECT @@session.multi_range_count; -@@session.multi_range_count -4294967295 -SET @@session.multi_range_count = 4294967294; -SELECT @@session.multi_range_count; -@@session.multi_range_count -4294967294 -'#------------------FN_DYNVARS_090_05-----------------------#' -SET @@global.multi_range_count = 0; -Warnings: -Warning 1292 Truncated incorrect multi_range_count value: '0' -SELECT @@global.multi_range_count; -@@global.multi_range_count -1 -SET @@global.multi_range_count = 4294967296; -Warnings: -Warning 1292 Truncated incorrect multi_range_count value: '4294967296' -SELECT @@global.multi_range_count; -@@global.multi_range_count -4294967295 -SET @@global.multi_range_count = -1024; -Warnings: -Warning 1292 Truncated incorrect multi_range_count value: '0' -SELECT @@global.multi_range_count; -@@global.multi_range_count -1 -SET @@global.multi_range_count = 429496729500; -Warnings: -Warning 1292 Truncated incorrect multi_range_count value: '429496729500' -SELECT @@global.multi_range_count; -@@global.multi_range_count -4294967295 -SET @@global.multi_range_count = 65530.34; -ERROR 42000: Incorrect argument type to variable 'multi_range_count' -SELECT @@global.multi_range_count; -@@global.multi_range_count -4294967295 -SET @@global.multi_range_count = test; -ERROR 42000: Incorrect argument type to variable 'multi_range_count' -SELECT @@global.multi_range_count; -@@global.multi_range_count -4294967295 -SET @@session.multi_range_count = 0; -Warnings: -Warning 1292 Truncated incorrect multi_range_count value: '0' -SELECT @@session.multi_range_count; -@@session.multi_range_count -1 -SET @@session.multi_range_count = 4294967296; -Warnings: -Warning 1292 Truncated incorrect multi_range_count value: '4294967296' -SELECT @@session.multi_range_count; -@@session.multi_range_count -4294967295 -SET @@session.multi_range_count = -1; -Warnings: -Warning 1292 Truncated incorrect multi_range_count value: '0' -SELECT @@session.multi_range_count; -@@session.multi_range_count -1 -SET @@session.multi_range_count = 65530.34.; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1 -SET @@session.multi_range_count = 4294967295021; -Warnings: -Warning 1292 Truncated incorrect multi_range_count value: '4294967295021' -SELECT @@session.multi_range_count; -@@session.multi_range_count -4294967295 -'Bug # 34837: Errors are not coming on assigning invalid values to variable'; -SET @@session.multi_range_count = test; -ERROR 42000: Incorrect argument type to variable 'multi_range_count' -SELECT @@session.multi_range_count; -@@session.multi_range_count -4294967295 -'#------------------FN_DYNVARS_090_06-----------------------#' -SELECT @@global.multi_range_count = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='multi_range_count'; -@@global.multi_range_count = VARIABLE_VALUE -1 -'#------------------FN_DYNVARS_090_07-----------------------#' -SELECT @@session.multi_range_count = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='multi_range_count'; -@@session.multi_range_count = VARIABLE_VALUE -1 -'#------------------FN_DYNVARS_090_08-----------------------#' -SET @@global.multi_range_count = TRUE; -SELECT @@global.multi_range_count; -@@global.multi_range_count -1 -SET @@global.multi_range_count = FALSE; -Warnings: -Warning 1292 Truncated incorrect multi_range_count value: '0' -SELECT @@global.multi_range_count; -@@global.multi_range_count -1 -'#---------------------FN_DYNVARS_090_09----------------------#' -SET @@global.multi_range_count = 10; -SELECT @@multi_range_count = @@global.multi_range_count; -@@multi_range_count = @@global.multi_range_count -0 -'#---------------------FN_DYNVARS_090_10----------------------#' -SET @@multi_range_count = 100; -SELECT @@multi_range_count = @@local.multi_range_count; -@@multi_range_count = @@local.multi_range_count -1 -SELECT @@local.multi_range_count = @@session.multi_range_count; -@@local.multi_range_count = @@session.multi_range_count -1 -'#---------------------FN_DYNVARS_090_11----------------------#' -SET multi_range_count = 1; -SELECT @@multi_range_count; -@@multi_range_count -1 -SELECT local.multi_range_count; -ERROR 42S02: Unknown table 'local' in field list -SELECT session.multi_range_count; -ERROR 42S02: Unknown table 'session' in field list -SELECT multi_range_count = @@session.multi_range_count; -ERROR 42S22: Unknown column 'multi_range_count' in 'field list' -SET @@global.multi_range_count = @start_global_value; -SELECT @@global.multi_range_count; -@@global.multi_range_count -256 -SET @@session.multi_range_count = @start_session_value; -SELECT @@session.multi_range_count; -@@session.multi_range_count -256 === removed file 'mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result' --- a/mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result 2008-07-23 15:40:59 +0000 +++ b/mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result 1970-01-01 00:00:00 +0000 @@ -1,184 +0,0 @@ -SET @start_global_value = @@global.multi_range_count; -SELECT @start_global_value; -@start_global_value -256 -SET @start_session_value = @@session.multi_range_count; -SELECT @start_session_value; -@start_session_value -256 -'#--------------------FN_DYNVARS_090_01-------------------------#' -SET @@global.multi_range_count = 100; -SET @@global.multi_range_count = DEFAULT; -SELECT @@global.multi_range_count; -@@global.multi_range_count -256 -SET @@session.multi_range_count = 200; -SET @@session.multi_range_count = DEFAULT; -SELECT @@session.multi_range_count; -@@session.multi_range_count -256 -'#--------------------FN_DYNVARS_090_02-------------------------#' -SET @@global.multi_range_count = DEFAULT; -SELECT @@global.multi_range_count = 256; -@@global.multi_range_count = 256 -1 -SET @@session.multi_range_count = DEFAULT; -SELECT @@session.multi_range_count = 256; -@@session.multi_range_count = 256 -1 -'#--------------------FN_DYNVARS_090_03-------------------------#' -SET @@global.multi_range_count = 1; -SELECT @@global.multi_range_count; -@@global.multi_range_count -1 -SET @@global.multi_range_count = 60020; -SELECT @@global.multi_range_count; -@@global.multi_range_count -60020 -SET @@global.multi_range_count = 65535; -SELECT @@global.multi_range_count; -@@global.multi_range_count -65535 -SET @@global.multi_range_count = 4294967295; -SELECT @@global.multi_range_count; -@@global.multi_range_count -4294967295 -SET @@global.multi_range_count = 4294967294; -SELECT @@global.multi_range_count; -@@global.multi_range_count -4294967294 -'#--------------------FN_DYNVARS_090_04-------------------------#' -SET @@session.multi_range_count = 1; -SELECT @@session.multi_range_count; -@@session.multi_range_count -1 -SET @@session.multi_range_count = 50050; -SELECT @@session.multi_range_count; -@@session.multi_range_count -50050 -SET @@session.multi_range_count = 65535; -SELECT @@session.multi_range_count; -@@session.multi_range_count -65535 -SET @@session.multi_range_count = 4294967295; -SELECT @@session.multi_range_count; -@@session.multi_range_count -4294967295 -SET @@session.multi_range_count = 4294967294; -SELECT @@session.multi_range_count; -@@session.multi_range_count -4294967294 -'#------------------FN_DYNVARS_090_05-----------------------#' -SET @@global.multi_range_count = 0; -Warnings: -Warning 1292 Truncated incorrect multi_range_count value: '0' -SELECT @@global.multi_range_count; -@@global.multi_range_count -1 -SET @@global.multi_range_count = 4294967296; -SELECT @@global.multi_range_count; -@@global.multi_range_count -4294967296 -SET @@global.multi_range_count = -1024; -Warnings: -Warning 1292 Truncated incorrect multi_range_count value: '0' -SELECT @@global.multi_range_count; -@@global.multi_range_count -1 -SET @@global.multi_range_count = 429496729500; -SELECT @@global.multi_range_count; -@@global.multi_range_count -429496729500 -SET @@global.multi_range_count = 65530.34; -ERROR 42000: Incorrect argument type to variable 'multi_range_count' -SELECT @@global.multi_range_count; -@@global.multi_range_count -429496729500 -SET @@global.multi_range_count = test; -ERROR 42000: Incorrect argument type to variable 'multi_range_count' -SELECT @@global.multi_range_count; -@@global.multi_range_count -429496729500 -SET @@session.multi_range_count = 0; -Warnings: -Warning 1292 Truncated incorrect multi_range_count value: '0' -SELECT @@session.multi_range_count; -@@session.multi_range_count -1 -SET @@session.multi_range_count = 4294967296; -SELECT @@session.multi_range_count; -@@session.multi_range_count -4294967296 -SET @@session.multi_range_count = -1; -Warnings: -Warning 1292 Truncated incorrect multi_range_count value: '0' -SELECT @@session.multi_range_count; -@@session.multi_range_count -1 -SET @@session.multi_range_count = 65530.34.; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1 -SET @@session.multi_range_count = 4294967295021; -SELECT @@session.multi_range_count; -@@session.multi_range_count -4294967295021 -'Bug # 34837: Errors are not coming on assigning invalid values to variable'; -SET @@session.multi_range_count = test; -ERROR 42000: Incorrect argument type to variable 'multi_range_count' -SELECT @@session.multi_range_count; -@@session.multi_range_count -4294967295021 -'#------------------FN_DYNVARS_090_06-----------------------#' -SELECT @@global.multi_range_count = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='multi_range_count'; -@@global.multi_range_count = VARIABLE_VALUE -1 -'#------------------FN_DYNVARS_090_07-----------------------#' -SELECT @@session.multi_range_count = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='multi_range_count'; -@@session.multi_range_count = VARIABLE_VALUE -1 -'#------------------FN_DYNVARS_090_08-----------------------#' -SET @@global.multi_range_count = TRUE; -SELECT @@global.multi_range_count; -@@global.multi_range_count -1 -SET @@global.multi_range_count = FALSE; -Warnings: -Warning 1292 Truncated incorrect multi_range_count value: '0' -SELECT @@global.multi_range_count; -@@global.multi_range_count -1 -'#---------------------FN_DYNVARS_090_09----------------------#' -SET @@global.multi_range_count = 10; -SELECT @@multi_range_count = @@global.multi_range_count; -@@multi_range_count = @@global.multi_range_count -0 -'#---------------------FN_DYNVARS_090_10----------------------#' -SET @@multi_range_count = 100; -SELECT @@multi_range_count = @@local.multi_range_count; -@@multi_range_count = @@local.multi_range_count -1 -SELECT @@local.multi_range_count = @@session.multi_range_count; -@@local.multi_range_count = @@session.multi_range_count -1 -'#---------------------FN_DYNVARS_090_11----------------------#' -SET multi_range_count = 1; -SELECT @@multi_range_count; -@@multi_range_count -1 -SELECT local.multi_range_count; -ERROR 42S02: Unknown table 'local' in field list -SELECT session.multi_range_count; -ERROR 42S02: Unknown table 'session' in field list -SELECT multi_range_count = @@session.multi_range_count; -ERROR 42S22: Unknown column 'multi_range_count' in 'field list' -SET @@global.multi_range_count = @start_global_value; -SELECT @@global.multi_range_count; -@@global.multi_range_count -256 -SET @@session.multi_range_count = @start_session_value; -SELECT @@session.multi_range_count; -@@session.multi_range_count -256 === removed file 'mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test' --- a/mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test 2008-07-23 15:40:59 +0000 +++ b/mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test 1970-01-01 00:00:00 +0000 @@ -1,9 +0,0 @@ -################################################################################ -# Created by Horst Hunger 2008-05-07 # -# # -# Wrapper for 32 bit machines # -################################################################################ - ---source include/have_32bit.inc ---source suite/sys_vars/inc/multi_range_count_basic.inc - === removed file 'mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test' --- a/mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test 2008-07-23 15:40:59 +0000 +++ b/mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test 1970-01-01 00:00:00 +0000 @@ -1,9 +0,0 @@ -################################################################################ -# Created by Horst Hunger 2008-05-07 # -# # -# Wrapper for 64 bit machines # -################################################################################ - ---source include/have_64bit.inc ---source suite/sys_vars/inc/multi_range_count_basic.inc -