| List: | Commits | « Previous MessageNext Message » | |
| From: | Patrick Crews | Date: | December 9 2008 7:34pm |
| Subject: | bzr commit into mysql-5.1-bugteam branch (patrick.crews:2730) | ||
| View as plain text | |||
#At file:///Users/pcrews/usr/local/bin/data1/work/storedproc/mysql-5.1-bugteam/ based on
revid:patrick.crews@stripped
2730 Patrick Crews 2008-12-09 [merge]
merge
removed:
mysql-test/suite/sys_vars/inc/tmp_table_size_basic.inc
mysql-test/suite/sys_vars/r/tmp_table_size_basic_32.result
mysql-test/suite/sys_vars/r/tmp_table_size_basic_64.result
mysql-test/suite/sys_vars/t/tmp_table_size_basic_32.test
mysql-test/suite/sys_vars/t/tmp_table_size_basic_64.test
added:
mysql-test/suite/sys_vars/r/tmp_table_size_basic.result
mysql-test/suite/sys_vars/t/tmp_table_size_basic.test
modified:
mysql-test/include/linux_sys_vars.inc
mysql-test/include/wait_until_connected_again.inc
mysql-test/include/windows_sys_vars.inc
mysql-test/suite/sys_vars/inc/key_buffer_size_basic.inc
mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc
mysql-test/suite/sys_vars/r/key_buffer_size_basic_32.result
mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result
mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result
mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result
mysql-test/t/disabled.def
=== modified file 'mysql-test/include/linux_sys_vars.inc'
--- a/mysql-test/include/linux_sys_vars.inc 2008-04-10 13:14:28 +0000
+++ b/mysql-test/include/linux_sys_vars.inc 2008-12-02 10:05:56 +0000
@@ -9,7 +9,6 @@ SET @min_flush_time = 0;
#SET @max_flush_time = 0;
SET @default_key_buffer_size = 131072;
-SET @min_key_buffer_size = 36;
#SET @default_join_buffer_size = 131072;
#SET @min_join_buffer_size = 8200;
=== modified file 'mysql-test/include/wait_until_connected_again.inc'
--- a/mysql-test/include/wait_until_connected_again.inc 2006-09-28 09:53:42 +0000
+++ b/mysql-test/include/wait_until_connected_again.inc 2008-12-02 11:34:52 +0000
@@ -6,7 +6,7 @@
let $counter= 500;
while ($mysql_errno)
{
- --error 0,2002,2006
+ --error 0,2002,2006,2013
show status;
dec $counter;
=== modified file 'mysql-test/include/windows_sys_vars.inc'
--- a/mysql-test/include/windows_sys_vars.inc 2008-04-10 13:14:28 +0000
+++ b/mysql-test/include/windows_sys_vars.inc 2008-12-02 10:05:56 +0000
@@ -9,7 +9,6 @@ SET @min_flush_time = 0;
#SET @max_flush_time = 0;
SET @default_key_buffer_size= 131072;
-SET @min_key_buffer_size= 8;
#SET @default_join_buffer_size = 131072;
#SET @min_join_buffer_size = 8200;
=== modified file 'mysql-test/suite/sys_vars/inc/key_buffer_size_basic.inc'
--- a/mysql-test/suite/sys_vars/inc/key_buffer_size_basic.inc 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/inc/key_buffer_size_basic.inc 2008-12-02 10:05:56 +0000
@@ -17,14 +17,14 @@
# * Valid & Invalid values #
# * Scope & Access method #
# * Data Integrity #
+# Modified: Horst Hunger 2008-11-27 #
+# Due to OS depending values the check has been changed #
+# from concrete values to ranges. #
# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
+# Reference: #
+# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html #
# #
###############################################################################
-# Changes: #
-# 2008-03-06 hhunger Got "lost connections with 5.1.24 #
-########################################################################
--source include/load_sysvars.inc
@@ -38,8 +38,6 @@
########################################################################
SET @start_value = @@global.key_buffer_size;
-SELECT @start_value;
-
--echo '#--------------------FN_DYNVARS_055_01------------------------#'
########################################################################
@@ -49,9 +47,7 @@ SELECT @start_value;
SET @@global.key_buffer_size = 99;
--Error ER_NO_DEFAULT
SET @@global.key_buffer_size = DEFAULT;
---echo 'Bug# 34878: This variable has default value according to documentation';
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
-
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
--echo '#---------------------FN_DYNVARS_055_02-------------------------#'
###############################################
@@ -66,26 +62,25 @@ SELECT @@global.key_buffer_size = @start
# Change the value of key_buffer_size to a valid value #
########################################################################
-SET @@global.key_buffer_size = @min_key_buffer_size;
-SELECT @@global.key_buffer_size= @min_key_buffer_size;
+SET @@global.key_buffer_size = 8 ;
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
--disable_warnings
-#Due to "lost connection"
+#Due to increasing the runtime significantly and allocating the buffer instantly.
#SET @@global.key_buffer_size = 4294967295;
--enable_warnings
#SELECT @@global.key_buffer_size;
SET @@global.key_buffer_size = 1800;
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
SET @@global.key_buffer_size = 65535;
SELECT @@global.key_buffer_size;
-echo 'Bug # 34837: Errors are not coming on assigning invalid values to variable';
-
--echo '#--------------------FN_DYNVARS_055_04-------------------------#'
###########################################################################
# Change the value of key_buffer_size to invalid value #
###########################################################################
-# Due to "lost connection"
+# Due to increasing the runtime significantly and allocating the buffer instantly
+# with a size of 18446744073709551615 bytes with 32bit exec.
#SET @@global.key_buffer_size = -1;
#SELECT @@global.key_buffer_size;
#SET @@global.key_buffer_size = 100000000000;
@@ -96,16 +91,14 @@ SELECT @@global.key_buffer_size;
#SET @@global.key_buffer_size = -1024;
#SELECT @@global.key_buffer_size;
SET @@global.key_buffer_size = 4;
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
---echo 'Bug # 34837: Errors are not coming on assigning invalid values to variable';
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.key_buffer_size = ON;
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.key_buffer_size = 'test';
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
-
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
--echo '#-------------------FN_DYNVARS_055_05----------------------------#'
###########################################################################
@@ -114,8 +107,7 @@ SELECT @@global.key_buffer_size = @min_k
--Error ER_GLOBAL_VARIABLE
SET @@session.key_buffer_size = 0;
-SELECT @@key_buffer_size = @min_key_buffer_size;
-
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
--echo '#----------------------FN_DYNVARS_055_06------------------------#'
##############################################################################
@@ -130,17 +122,15 @@ SELECT @@key_buffer_size = VARIABLE_VALU
FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='key_buffer_size';
-
--echo '#---------------------FN_DYNVARS_055_07----------------------#'
###################################################################
# Check if TRUE and FALSE values can be used on variable #
###################################################################
SET @@global.key_buffer_size = TRUE;
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
SET @@global.key_buffer_size = FALSE;
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
-
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
--echo '#---------------------FN_DYNVARS_055_08----------------------#'
#####################################################################
@@ -150,7 +140,7 @@ SELECT @@global.key_buffer_size = @min_k
# due to differences in contents of the warnings
--disable_warnings
-SET @@global.key_buffer_size = @min_key_buffer_size;
+SET @@global.key_buffer_size = 8 ;
SELECT @@key_buffer_size = @@global.key_buffer_size;
--enable_warnings
@@ -160,8 +150,8 @@ SELECT @@key_buffer_size = @@global.key_
##########################################################################
--Error ER_GLOBAL_VARIABLE
-SET key_buffer_size = @min_key_buffer_size;
-SELECT @@key_buffer_size = @min_key_buffer_size;
+SET key_buffer_size = 8 ;
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
--Error ER_PARSE_ERROR
SET local.key_buffer_size = 10;
--Error ER_UNKNOWN_TABLE
@@ -179,9 +169,9 @@ SELECT key_buffer_size = @@session.key_b
##############################
SET @@global.key_buffer_size = @start_value;
-SELECT @@global.key_buffer_size;
--enable_warnings
#######################################################################
# END OF key_buffer_size TESTS #
#######################################################################
+
=== modified file 'mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc'
--- a/mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc 2008-12-01 08:32:07 +0000
@@ -17,9 +17,12 @@
# * Valid & Invalid values #
# * Scope & Access method #
# * Data Integrity #
+# Modified: Horst Hunger, 2008-11-28 #
+# disabled warnings as they contain the values of this variable, #
+# modified the check of the value only checking a range. #
# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
+# Reference: #
+# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html #
# #
###############################################################################
@@ -29,7 +32,7 @@
######################################################################
-# START OF sort_buffer_size TESTS #
+# START OF sort_buffer_size TESTS #
######################################################################
@@ -37,65 +40,63 @@
# Save initial value #
#############################################################
-# due to difference when running on Windows (bug filed)
+# due to differences when running on Windows (bug filed)
--source include/not_windows.inc
+--disable_warnings
+
SET @start_global_value = @@global.sort_buffer_size;
-SELECT @start_global_value;
SET @start_session_value = @@session.sort_buffer_size;
-SELECT @start_session_value;
-
--echo '#--------------------FN_DYNVARS_151_01-------------------------#'
######################################################################
-# Display the DEFAULT value of sort_buffer_size #
+# Display the DEFAULT value of sort_buffer_size #
######################################################################
SET @@global.sort_buffer_size = 1000;
SET @@global.sort_buffer_size = DEFAULT;
-SELECT @@global.sort_buffer_size= 2097144 OR @@global.sort_buffer_size= 2097116;
+SELECT @@global.sort_buffer_size >= 2097116 AND @@global.sort_buffer_size <
3000000;
SET @@session.sort_buffer_size = 2000;
SET @@session.sort_buffer_size = DEFAULT;
-SELECT @@session.sort_buffer_size= 2097144 OR @@session.sort_buffer_size= 2097116;
+SELECT @@session.sort_buffer_size >= 2097116 AND @@session.sort_buffer_size <
3000000;
--echo '#--------------------FN_DYNVARS_151_02-------------------------#'
######################################################################
-# Check the DEFAULT value of sort_buffer_size #
+# Check the DEFAULT value of sort_buffer_size #
######################################################################
SET @@global.sort_buffer_size = DEFAULT;
-SELECT @@global.sort_buffer_size = 2097144 OR @@global.sort_buffer_size= 2097116;
+SELECT @@global.sort_buffer_size >= 2097116 AND @@global.sort_buffer_size <
3000000;
SET @@session.sort_buffer_size = DEFAULT;
-SELECT @@session.sort_buffer_size = 2097144 OR @@session.sort_buffer_size= 2097116;
+SELECT @@session.sort_buffer_size >= 2097116 AND @@session.sort_buffer_size <
3000000;
--echo '#--------------------FN_DYNVARS_151_03-------------------------#'
################################################################################
-# Change the value of sort_buffer_size to a valid value for GLOBAL Scope #
+# Change the value of sort_buffer_size to a valid value for GLOBAL Scope #
################################################################################
SET @@global.sort_buffer_size = 32776;
-SELECT @@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804;
+SELECT @@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000;
SET @@global.sort_buffer_size = 32777;
-SELECT @@global.sort_buffer_size= 32777 OR @@global.sort_buffer_size= 32804;
+SELECT @@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000;
SET @@global.sort_buffer_size = 4294967295;
SELECT @@global.sort_buffer_size;
SET @@global.sort_buffer_size = 4294967294;
SELECT @@global.sort_buffer_size;
---echo 'Bug# 34877: Invalid Values are showing in variable on assigning valid values.';
--echo '#--------------------FN_DYNVARS_151_04-------------------------#'
###################################################################################
-# Change the value of sort_buffer_size to a valid value for SESSION Scope #
+# Change the value of sort_buffer_size to a valid value for SESSION Scope #
###################################################################################
SET @@session.sort_buffer_size = 32776;
-SELECT @@session.sort_buffer_size= 32776 OR @@session.sort_buffer_size= 32804;
+SELECT @@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000;
SET @@session.sort_buffer_size = 32777;
-SELECT @@session.sort_buffer_size= 32777 OR @@session.sort_buffer_size= 32804;
+SELECT @@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000;
SET @@session.sort_buffer_size = 4294967295;
SELECT @@session.sort_buffer_size;
SET @@session.sort_buffer_size = 4294967294;
@@ -104,13 +105,13 @@ SELECT @@session.sort_buffer_size;
--echo '#------------------FN_DYNVARS_151_05-----------------------#'
##################################################################
-# Change the value of sort_buffer_size to an invalid value #
+# Change the value of sort_buffer_size to an invalid value #
##################################################################
SET @@global.sort_buffer_size = 32775;
-SELECT @@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804;
+SELECT @@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000;
SET @@global.sort_buffer_size = -1024;
-SELECT @@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804;
+SELECT @@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000;
SET @@global.sort_buffer_size = 4294967296;
SELECT @@global.sort_buffer_size;
--Error ER_PARSE_ERROR
@@ -121,19 +122,16 @@ SET @@global.sort_buffer_size = test;
SELECT @@global.sort_buffer_size;
SET @@session.sort_buffer_size = 32775;
-SELECT @@session.sort_buffer_size= 32776 OR @@session.sort_buffer_size= 32804;
+SELECT @@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000;
SET @@session.sort_buffer_size = -2;
-SELECT @@session.sort_buffer_size= 32776 OR @@session.sort_buffer_size= 32804;
+SELECT @@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000;
--Error ER_PARSE_ERROR
SET @@session.sort_buffer_size = 65530.34.;
SET @@session.sort_buffer_size = 4294967296;
SELECT @@session.sort_buffer_size;
---echo 'Bug # 34837: Errors are not coming on assigning invalid values to variable';
--Error ER_WRONG_TYPE_FOR_VAR
SET @@session.sort_buffer_size = test;
-SELECT @@session.sort_buffer_size;
-
--echo '#------------------FN_DYNVARS_151_06-----------------------#'
####################################################################
@@ -141,14 +139,16 @@ SELECT @@session.sort_buffer_size;
####################################################################
-SELECT @@global.sort_buffer_size = VARIABLE_VALUE FROM
INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size';
+SELECT @@global.sort_buffer_size = VARIABLE_VALUE FROM
+ INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size';
--echo '#------------------FN_DYNVARS_151_07-----------------------#'
####################################################################
# Check if the value in SESSION Table matches value in variable #
####################################################################
-SELECT @@session.sort_buffer_size = VARIABLE_VALUE FROM
INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size';
+SELECT @@session.sort_buffer_size = VARIABLE_VALUE FROM
+ INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size';
--echo '#------------------FN_DYNVARS_151_08-----------------------#'
@@ -157,25 +157,22 @@ SELECT @@session.sort_buffer_size = VARI
####################################################################
SET @@global.sort_buffer_size = TRUE;
-SELECT @@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804;
+SELECT @@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000;
SET @@global.sort_buffer_size = FALSE;
-SELECT @@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804;
-echo 'Bug: Errors should be displayed on assigning TRUE/FALSE to variable';
-
+SELECT @@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000;
--echo '#---------------------FN_DYNVARS_151_09----------------------#'
####################################################################################
-# Check if accessing variable with and without GLOBAL point to same variable #
+# Check if accessing variable with and without GLOBAL point to same variable #
####################################################################################
SET @@global.sort_buffer_size = 9000;
SELECT @@sort_buffer_size = @@global.sort_buffer_size;
-
--echo '#---------------------FN_DYNVARS_151_10----------------------#'
-########################################################################################################
-# Check if accessing variable with SESSION,LOCAL and without SCOPE points to same
session variable #
-########################################################################################################
+###################################################################################################
+# Check if accessing variable with SESSION,LOCAL and without SCOPE points to same session
variable#
+###################################################################################################
SET @@sort_buffer_size = 9000;
SELECT @@sort_buffer_size = @@local.sort_buffer_size;
@@ -184,12 +181,11 @@ SELECT @@local.sort_buffer_size = @@sess
--echo '#---------------------FN_DYNVARS_151_11----------------------#'
###################################################################################
-# Check if sort_buffer_size can be accessed with and without @@ sign #
+# Check if sort_buffer_size can be accessed with and without @@ sign #
###################################################################################
SET sort_buffer_size = 9100;
-SELECT @sort_buffer_size= 32776 OR @@sort_buffer_size= 32804;
-SELECT @@sort_buffer_size;
+SELECT @@sort_buffer_size >= 32776 AND @@sort_buffer_size < 33000;
--Error ER_UNKNOWN_TABLE
SELECT local.sort_buffer_size;
--Error ER_UNKNOWN_TABLE
@@ -203,11 +199,11 @@ SELECT sort_buffer_size = @@session.sort
####################################
SET @@global.sort_buffer_size = @start_global_value;
-SELECT @@global.sort_buffer_size;
SET @@session.sort_buffer_size = @start_session_value;
-SELECT @@session.sort_buffer_size;
+--enable_warnings
#############################################################
-# END OF sort_buffer_size TESTS #
+# END OF sort_buffer_size TESTS #
#############################################################
+
=== removed file 'mysql-test/suite/sys_vars/inc/tmp_table_size_basic.inc'
--- a/mysql-test/suite/sys_vars/inc/tmp_table_size_basic.inc 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/inc/tmp_table_size_basic.inc 1970-01-01 00:00:00 +0000
@@ -1,233 +0,0 @@
-############## mysql-test\t\tmp_table_size_basic.test #########################
-# #
-# Variable Name: tmp_table_size #
-# Scope: GLOBAL | SESSION #
-# Access Type: Dynamic #
-# Data Type: numeric #
-# Default Value: 33554432 #
-# Range: 1024-4294967295 #
-# #
-# #
-# Creation Date: 2008-02-13 #
-# Author: Salman #
-# #
-# Description: Test Cases of Dynamic System Variable tmp_table_size #
-# 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#option_mysqld_tmp_table_size #
-# #
-###############################################################################
-
---source include/load_sysvars.inc
-
-##############################################################
-# START OF tmp_table_size TESTS #
-##############################################################
-
-
-#############################################################
-# Save initial value #
-#############################################################
-
-SET @start_global_value = @@global.tmp_table_size;
-SELECT @start_global_value;
-SET @start_session_value = @@session.tmp_table_size;
-SELECT @start_session_value;
-
---echo 'Bug# 34876: This variable has invalid default value as compared to
documentation';
-
---echo '#--------------------FN_DYNVARS_005_01-------------------------#'
-##############################################################
-# Display the DEFAULT value of tmp_table_size #
-##############################################################
-
-SET @@global.tmp_table_size = 100;
-SET @@global.tmp_table_size = DEFAULT;
-SELECT @@global.tmp_table_size;
-
---echo 'Bug# 34876: This variable has invalid default value as compared to
documentation';
-SET @@session.tmp_table_size = 200;
-SET @@session.tmp_table_size = DEFAULT;
-SELECT @@session.tmp_table_size;
---echo 'Bug# 34876: This variable has invalid default value as compared to
documentation';
-
-
---echo '#--------------------FN_DYNVARS_005_02-------------------------#'
-########################################################################
-# Check the DEFAULT value of tmp_table_size #
-########################################################################
-
-SET @@global.tmp_table_size = DEFAULT;
-SELECT @@global.tmp_table_size = 33554432;
-
-SET @@session.tmp_table_size = DEFAULT;
-SELECT @@session.tmp_table_size = 33554432;
-
---echo 'Bug# 34876: This variable has invalid default value as compared to
documentation';
-
---echo '#--------------------FN_DYNVARS_005_03-------------------------#'
-########################################################################
-# Change the value of tmp_table_size to a valid value for GLOBAL Scope #
-########################################################################
-
-SET @@global.tmp_table_size = 1024;
-SELECT @@global.tmp_table_size;
-SET @@global.tmp_table_size = 60020;
-SELECT @@global.tmp_table_size;
-SET @@global.tmp_table_size = 4294967295;
-SELECT @@global.tmp_table_size;
-
-
---echo '#--------------------FN_DYNVARS_005_04-------------------------#'
-#########################################################################
-# Change the value of tmp_table_size to a valid value for SESSION Scope #
-#########################################################################
-
-SET @@session.tmp_table_size = 1024;
-SELECT @@session.tmp_table_size;
-
-SET @@session.tmp_table_size =4294967295;
-SELECT @@session.tmp_table_size;
-SET @@session.tmp_table_size = 65535;
-SELECT @@session.tmp_table_size;
-
-
---echo '#------------------FN_DYNVARS_005_05-----------------------#'
-##########################################################
-# Change the value of tmp_table_size to an invalid value #
-##########################################################
-
-SET @@global.tmp_table_size = 0;
-SELECT @@global.tmp_table_size;
-
-SET @@global.tmp_table_size = -1024;
-SELECT @@global.tmp_table_size;
-
-SET @@global.tmp_table_size = 1000;
-SELECT @@global.tmp_table_size;
-
---echo 'Bug # 34837: Errors are not coming on assigning invalid values to variable';
-
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.tmp_table_size = ON;
-
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.tmp_table_size = OFF;
-
-
-SET @@global.tmp_table_size = True;
-SELECT @@global.tmp_table_size;
-
-SET @@global.tmp_table_size = False;
-SELECT @@global.tmp_table_size;
---echo 'Bug:Error should be shown that variable is numeric and can not assigned boolean
value';
-
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.tmp_table_size = 65530.34;
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.tmp_table_size ="Test";
-
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.tmp_table_size = ON;
-
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.tmp_table_size = OFF;
-
-SET @@session.tmp_table_size = True;
-SELECT @@session.tmp_table_size;
-
-SET @@session.tmp_table_size = False;
-SELECT @@session.tmp_table_size;
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.tmp_table_size = "Test";
-
-SET @@session.tmp_table_size = 12345678901;
-SELECT @@session.tmp_table_size;
-
-
---echo '#------------------FN_DYNVARS_005_06-----------------------#'
-####################################################################
-# Check if the value in GLOBAL Table matches value in variable #
-####################################################################
-
-
-SELECT @@global.tmp_table_size = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='tmp_table_size';
-
---echo '#------------------FN_DYNVARS_005_07-----------------------#'
-####################################################################
-# Check if the value in SESSION Table matches value in variable #
-####################################################################
-
-SELECT @@session.tmp_table_size = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='tmp_table_size';
-
-
-
-
---echo '#---------------------FN_DYNVARS_001_09----------------------#'
-########################################################################
-# Check if global and session variables are independent of each other #
-########################################################################
-
-SET @@global.tmp_table_size = 1024;
-SET @@tmp_table_size = 4294967295;
-SELECT @@tmp_table_size = @@global.tmp_table_size;
-
---echo '#---------------------FN_DYNVARS_001_10----------------------#'
-##################################################################
-# Check if accessing variable with SESSION,LOCAL and without #
-# SCOPE points to same session variable #
-##################################################################
-
-SET @@tmp_table_size = 100;
-SELECT @@tmp_table_size = @@local.tmp_table_size;
-SELECT @@local.tmp_table_size = @@session.tmp_table_size;
-
-
---echo '#---------------------FN_DYNVARS_001_11----------------------#'
-#########################################################################
-# Check if tmp_table_size can be accessed with and without @@ sign #
-#########################################################################
-
-SET tmp_table_size = 1027;
-SELECT @@tmp_table_size;
-
---Error ER_UNKNOWN_TABLE
-SELECT local.tmp_table_size;
-
---Error ER_UNKNOWN_TABLE
-SELECT global.tmp_table_size;
-
---Error ER_BAD_FIELD_ERROR
-SELECT tmp_table_size = @@session.tmp_table_size;
-
-
-####################################
-# Restore initial value #
-####################################
-
-SET @@global.tmp_table_size = @start_global_value;
-SELECT @@global.tmp_table_size;
-SET @@session.tmp_table_size = @start_session_value;
-SELECT @@session.tmp_table_size;
-
-
-###################################################
-# END OF tmp_table_size TESTS #
-###################################################
-
=== modified file 'mysql-test/suite/sys_vars/r/key_buffer_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/key_buffer_size_basic_32.result 2008-07-23 14:06:44
+0000
+++ b/mysql-test/suite/sys_vars/r/key_buffer_size_basic_32.result 2008-12-02 10:05:56
+0000
@@ -1,14 +1,10 @@
SET @start_value = @@global.key_buffer_size;
-SELECT @start_value;
-@start_value
-1048576
'#--------------------FN_DYNVARS_055_01------------------------#'
SET @@global.key_buffer_size = 99;
SET @@global.key_buffer_size = DEFAULT;
ERROR 42000: Variable 'key_buffer_size' doesn't have a default value
-'Bug# 34878: This variable has default value according to documentation';
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
-@@global.key_buffer_size = @min_key_buffer_size
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
'#---------------------FN_DYNVARS_055_02-------------------------#'
SET @@global.key_buffer_size = @start_value;
@@ -16,21 +12,20 @@ SELECT @@global.key_buffer_size = @start
@@global.key_buffer_size = @start_value
1
'#--------------------FN_DYNVARS_055_03------------------------#'
-SET @@global.key_buffer_size = @min_key_buffer_size;
-SELECT @@global.key_buffer_size= @min_key_buffer_size;
-@@global.key_buffer_size= @min_key_buffer_size
+SET @@global.key_buffer_size = 8 ;
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
SET @@global.key_buffer_size = 1800;
Warnings:
Warning 1292 Truncated incorrect key_buffer_size value: '1800'
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
-@@global.key_buffer_size = @min_key_buffer_size
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
SET @@global.key_buffer_size = 65535;
SELECT @@global.key_buffer_size;
@@global.key_buffer_size
61440
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
'#--------------------FN_DYNVARS_055_04-------------------------#'
SET @@global.key_buffer_size = 10000.01;
ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
@@ -40,25 +35,24 @@ SELECT @@global.key_buffer_size;
SET @@global.key_buffer_size = 4;
Warnings:
Warning 1292 Truncated incorrect key_buffer_size value: '4'
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
-@@global.key_buffer_size = @min_key_buffer_size
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
SET @@global.key_buffer_size = ON;
ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
-@@global.key_buffer_size = @min_key_buffer_size
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
SET @@global.key_buffer_size = 'test';
ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
-@@global.key_buffer_size = @min_key_buffer_size
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
'#-------------------FN_DYNVARS_055_05----------------------------#'
SET @@session.key_buffer_size = 0;
ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET
GLOBAL
-SELECT @@key_buffer_size = @min_key_buffer_size;
-@@key_buffer_size = @min_key_buffer_size
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
'#----------------------FN_DYNVARS_055_06------------------------#'
SELECT @@global.key_buffer_size = VARIABLE_VALUE
@@ -75,25 +69,25 @@ WHERE VARIABLE_NAME='key_buffer_size';
SET @@global.key_buffer_size = TRUE;
Warnings:
Warning 1292 Truncated incorrect key_buffer_size value: '1'
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
-@@global.key_buffer_size = @min_key_buffer_size
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
SET @@global.key_buffer_size = FALSE;
Warnings:
Warning 1438 Cannot drop default keycache
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
-@@global.key_buffer_size = @min_key_buffer_size
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
'#---------------------FN_DYNVARS_055_08----------------------#'
-SET @@global.key_buffer_size = @min_key_buffer_size;
+SET @@global.key_buffer_size = 8 ;
SELECT @@key_buffer_size = @@global.key_buffer_size;
@@key_buffer_size = @@global.key_buffer_size
1
'#---------------------FN_DYNVARS_055_09----------------------#'
-SET key_buffer_size = @min_key_buffer_size;
+SET key_buffer_size = 8 ;
ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET
GLOBAL
-SELECT @@key_buffer_size = @min_key_buffer_size;
-@@key_buffer_size = @min_key_buffer_size
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
SET local.key_buffer_size = 10;
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 'key_buffer_size = 10' at line
1
@@ -106,6 +100,3 @@ ERROR 42S02: Unknown table 'global' in f
SELECT key_buffer_size = @@session.key_buffer_size;
ERROR 42S22: Unknown column 'key_buffer_size' in 'field list'
SET @@global.key_buffer_size = @start_value;
-SELECT @@global.key_buffer_size;
-@@global.key_buffer_size
-1048576
=== modified file 'mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result 2008-07-23 14:06:44
+0000
+++ b/mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result 2008-12-02 10:05:56
+0000
@@ -1,14 +1,10 @@
SET @start_value = @@global.key_buffer_size;
-SELECT @start_value;
-@start_value
-1048576
'#--------------------FN_DYNVARS_055_01------------------------#'
SET @@global.key_buffer_size = 99;
SET @@global.key_buffer_size = DEFAULT;
ERROR 42000: Variable 'key_buffer_size' doesn't have a default value
-'Bug# 34878: This variable has default value according to documentation';
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
-@@global.key_buffer_size = @min_key_buffer_size
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
'#---------------------FN_DYNVARS_055_02-------------------------#'
SET @@global.key_buffer_size = @start_value;
@@ -16,21 +12,20 @@ SELECT @@global.key_buffer_size = @start
@@global.key_buffer_size = @start_value
1
'#--------------------FN_DYNVARS_055_03------------------------#'
-SET @@global.key_buffer_size = @min_key_buffer_size;
-SELECT @@global.key_buffer_size= @min_key_buffer_size;
-@@global.key_buffer_size= @min_key_buffer_size
+SET @@global.key_buffer_size = 8 ;
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
SET @@global.key_buffer_size = 1800;
Warnings:
Warning 1292 Truncated incorrect key_buffer_size value: '1800'
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
-@@global.key_buffer_size = @min_key_buffer_size
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
SET @@global.key_buffer_size = 65535;
SELECT @@global.key_buffer_size;
@@global.key_buffer_size
61440
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
'#--------------------FN_DYNVARS_055_04-------------------------#'
SET @@global.key_buffer_size = 10000.01;
ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
@@ -40,25 +35,24 @@ SELECT @@global.key_buffer_size;
SET @@global.key_buffer_size = 4;
Warnings:
Warning 1292 Truncated incorrect key_buffer_size value: '4'
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
-@@global.key_buffer_size = @min_key_buffer_size
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
SET @@global.key_buffer_size = ON;
ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
-@@global.key_buffer_size = @min_key_buffer_size
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
SET @@global.key_buffer_size = 'test';
ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
-@@global.key_buffer_size = @min_key_buffer_size
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
'#-------------------FN_DYNVARS_055_05----------------------------#'
SET @@session.key_buffer_size = 0;
ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET
GLOBAL
-SELECT @@key_buffer_size = @min_key_buffer_size;
-@@key_buffer_size = @min_key_buffer_size
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
'#----------------------FN_DYNVARS_055_06------------------------#'
SELECT @@global.key_buffer_size = VARIABLE_VALUE
@@ -75,25 +69,25 @@ WHERE VARIABLE_NAME='key_buffer_size';
SET @@global.key_buffer_size = TRUE;
Warnings:
Warning 1292 Truncated incorrect key_buffer_size value: '1'
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
-@@global.key_buffer_size = @min_key_buffer_size
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
SET @@global.key_buffer_size = FALSE;
Warnings:
Warning 1438 Cannot drop default keycache
-SELECT @@global.key_buffer_size = @min_key_buffer_size;
-@@global.key_buffer_size = @min_key_buffer_size
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
'#---------------------FN_DYNVARS_055_08----------------------#'
-SET @@global.key_buffer_size = @min_key_buffer_size;
+SET @@global.key_buffer_size = 8 ;
SELECT @@key_buffer_size = @@global.key_buffer_size;
@@key_buffer_size = @@global.key_buffer_size
1
'#---------------------FN_DYNVARS_055_09----------------------#'
-SET key_buffer_size = @min_key_buffer_size;
+SET key_buffer_size = 8 ;
ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET
GLOBAL
-SELECT @@key_buffer_size = @min_key_buffer_size;
-@@key_buffer_size = @min_key_buffer_size
+SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36;
+@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36
1
SET local.key_buffer_size = 10;
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 'key_buffer_size = 10' at line
1
@@ -106,6 +100,3 @@ ERROR 42S02: Unknown table 'global' in f
SELECT key_buffer_size = @@session.key_buffer_size;
ERROR 42S22: Unknown column 'key_buffer_size' in 'field list'
SET @@global.key_buffer_size = @start_value;
-SELECT @@global.key_buffer_size;
-@@global.key_buffer_size
-1048576
=== modified file 'mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result 2008-07-23 14:06:44
+0000
+++ b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result 2008-12-01 08:32:07
+0000
@@ -1,47 +1,33 @@
SET @start_global_value = @@global.sort_buffer_size;
-SELECT @start_global_value;
-@start_global_value
-262144
SET @start_session_value = @@session.sort_buffer_size;
-SELECT @start_session_value;
-@start_session_value
-262144
'#--------------------FN_DYNVARS_151_01-------------------------#'
SET @@global.sort_buffer_size = 1000;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '1000'
SET @@global.sort_buffer_size = DEFAULT;
-SELECT @@global.sort_buffer_size= 2097144 OR @@global.sort_buffer_size= 2097116;
-@@global.sort_buffer_size= 2097144 OR @@global.sort_buffer_size= 2097116
+SELECT @@global.sort_buffer_size >= 2097116 AND @@global.sort_buffer_size <
3000000;
+@@global.sort_buffer_size >= 2097116 AND @@global.sort_buffer_size < 3000000
1
SET @@session.sort_buffer_size = 2000;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '2000'
SET @@session.sort_buffer_size = DEFAULT;
-SELECT @@session.sort_buffer_size= 2097144 OR @@session.sort_buffer_size= 2097116;
-@@session.sort_buffer_size= 2097144 OR @@session.sort_buffer_size= 2097116
+SELECT @@session.sort_buffer_size >= 2097116 AND @@session.sort_buffer_size <
3000000;
+@@session.sort_buffer_size >= 2097116 AND @@session.sort_buffer_size < 3000000
1
'#--------------------FN_DYNVARS_151_02-------------------------#'
SET @@global.sort_buffer_size = DEFAULT;
-SELECT @@global.sort_buffer_size = 2097144 OR @@global.sort_buffer_size= 2097116;
-@@global.sort_buffer_size = 2097144 OR @@global.sort_buffer_size= 2097116
+SELECT @@global.sort_buffer_size >= 2097116 AND @@global.sort_buffer_size <
3000000;
+@@global.sort_buffer_size >= 2097116 AND @@global.sort_buffer_size < 3000000
1
SET @@session.sort_buffer_size = DEFAULT;
-SELECT @@session.sort_buffer_size = 2097144 OR @@session.sort_buffer_size= 2097116;
-@@session.sort_buffer_size = 2097144 OR @@session.sort_buffer_size= 2097116
+SELECT @@session.sort_buffer_size >= 2097116 AND @@session.sort_buffer_size <
3000000;
+@@session.sort_buffer_size >= 2097116 AND @@session.sort_buffer_size < 3000000
1
'#--------------------FN_DYNVARS_151_03-------------------------#'
SET @@global.sort_buffer_size = 32776;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '32776'
-SELECT @@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804;
-@@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804
+SELECT @@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000;
+@@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000
1
SET @@global.sort_buffer_size = 32777;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '32777'
-SELECT @@global.sort_buffer_size= 32777 OR @@global.sort_buffer_size= 32804;
-@@global.sort_buffer_size= 32777 OR @@global.sort_buffer_size= 32804
+SELECT @@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000;
+@@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000
1
SET @@global.sort_buffer_size = 4294967295;
SELECT @@global.sort_buffer_size;
@@ -51,19 +37,14 @@ SET @@global.sort_buffer_size = 42949672
SELECT @@global.sort_buffer_size;
@@global.sort_buffer_size
4294967294
-'Bug# 34877: Invalid Values are showing in variable on assigning valid values.';
'#--------------------FN_DYNVARS_151_04-------------------------#'
SET @@session.sort_buffer_size = 32776;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '32776'
-SELECT @@session.sort_buffer_size= 32776 OR @@session.sort_buffer_size= 32804;
-@@session.sort_buffer_size= 32776 OR @@session.sort_buffer_size= 32804
+SELECT @@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000;
+@@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000
1
SET @@session.sort_buffer_size = 32777;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '32777'
-SELECT @@session.sort_buffer_size= 32777 OR @@session.sort_buffer_size= 32804;
-@@session.sort_buffer_size= 32777 OR @@session.sort_buffer_size= 32804
+SELECT @@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000;
+@@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000
1
SET @@session.sort_buffer_size = 4294967295;
SELECT @@session.sort_buffer_size;
@@ -75,20 +56,14 @@ SELECT @@session.sort_buffer_size;
4294967294
'#------------------FN_DYNVARS_151_05-----------------------#'
SET @@global.sort_buffer_size = 32775;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '32775'
-SELECT @@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804;
-@@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804
+SELECT @@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000;
+@@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000
1
SET @@global.sort_buffer_size = -1024;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '0'
-SELECT @@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804;
-@@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804
+SELECT @@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000;
+@@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000
1
SET @@global.sort_buffer_size = 4294967296;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '4294967296'
SELECT @@global.sort_buffer_size;
@@global.sort_buffer_size
4294967295
@@ -103,64 +78,47 @@ SELECT @@global.sort_buffer_size;
@@global.sort_buffer_size
4294967295
SET @@session.sort_buffer_size = 32775;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '32775'
-SELECT @@session.sort_buffer_size= 32776 OR @@session.sort_buffer_size= 32804;
-@@session.sort_buffer_size= 32776 OR @@session.sort_buffer_size= 32804
+SELECT @@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000;
+@@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000
1
SET @@session.sort_buffer_size = -2;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '0'
-SELECT @@session.sort_buffer_size= 32776 OR @@session.sort_buffer_size= 32804;
-@@session.sort_buffer_size= 32776 OR @@session.sort_buffer_size= 32804
+SELECT @@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000;
+@@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000
1
SET @@session.sort_buffer_size = 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.sort_buffer_size = 4294967296;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '4294967296'
SELECT @@session.sort_buffer_size;
@@session.sort_buffer_size
4294967295
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
SET @@session.sort_buffer_size = test;
ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-4294967295
'#------------------FN_DYNVARS_151_06-----------------------#'
-SELECT @@global.sort_buffer_size = VARIABLE_VALUE FROM
INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size';
+SELECT @@global.sort_buffer_size = VARIABLE_VALUE FROM
+INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size';
@@global.sort_buffer_size = VARIABLE_VALUE
1
'#------------------FN_DYNVARS_151_07-----------------------#'
-SELECT @@session.sort_buffer_size = VARIABLE_VALUE FROM
INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size';
+SELECT @@session.sort_buffer_size = VARIABLE_VALUE FROM
+INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size';
@@session.sort_buffer_size = VARIABLE_VALUE
1
'#------------------FN_DYNVARS_151_08-----------------------#'
SET @@global.sort_buffer_size = TRUE;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '1'
-SELECT @@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804;
-@@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804
+SELECT @@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000;
+@@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000
1
SET @@global.sort_buffer_size = FALSE;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '0'
-SELECT @@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804;
-@@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804
+SELECT @@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000;
+@@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000
1
-'Bug: Errors should be displayed on assigning TRUE/FALSE to variable'
'#---------------------FN_DYNVARS_151_09----------------------#'
SET @@global.sort_buffer_size = 9000;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '9000'
SELECT @@sort_buffer_size = @@global.sort_buffer_size;
@@sort_buffer_size = @@global.sort_buffer_size
0
'#---------------------FN_DYNVARS_151_10----------------------#'
SET @@sort_buffer_size = 9000;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '9000'
SELECT @@sort_buffer_size = @@local.sort_buffer_size;
@@sort_buffer_size = @@local.sort_buffer_size
1
@@ -169,14 +127,9 @@ SELECT @@local.sort_buffer_size = @@sess
1
'#---------------------FN_DYNVARS_151_11----------------------#'
SET sort_buffer_size = 9100;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '9100'
-SELECT @sort_buffer_size= 32776 OR @@sort_buffer_size= 32804;
-@sort_buffer_size= 32776 OR @@sort_buffer_size= 32804
-1
-SELECT @@sort_buffer_size;
-@@sort_buffer_size
-32804
+SELECT @@sort_buffer_size >= 32776 AND @@sort_buffer_size < 33000;
+@@sort_buffer_size >= 32776 AND @@sort_buffer_size < 33000
+1
SELECT local.sort_buffer_size;
ERROR 42S02: Unknown table 'local' in field list
SELECT session.sort_buffer_size;
@@ -184,10 +137,4 @@ ERROR 42S02: Unknown table 'session' in
SELECT sort_buffer_size = @@session.sort_buffer_size;
ERROR 42S22: Unknown column 'sort_buffer_size' in 'field list'
SET @@global.sort_buffer_size = @start_global_value;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-262144
SET @@session.sort_buffer_size = @start_session_value;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-262144
=== modified file 'mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result 2008-07-23 14:06:44
+0000
+++ b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result 2008-12-01 08:32:07
+0000
@@ -1,47 +1,33 @@
SET @start_global_value = @@global.sort_buffer_size;
-SELECT @start_global_value;
-@start_global_value
-262144
SET @start_session_value = @@session.sort_buffer_size;
-SELECT @start_session_value;
-@start_session_value
-262144
'#--------------------FN_DYNVARS_151_01-------------------------#'
SET @@global.sort_buffer_size = 1000;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '1000'
SET @@global.sort_buffer_size = DEFAULT;
-SELECT @@global.sort_buffer_size= 2097144 OR @@global.sort_buffer_size= 2097116;
-@@global.sort_buffer_size= 2097144 OR @@global.sort_buffer_size= 2097116
+SELECT @@global.sort_buffer_size >= 2097116 AND @@global.sort_buffer_size <
3000000;
+@@global.sort_buffer_size >= 2097116 AND @@global.sort_buffer_size < 3000000
1
SET @@session.sort_buffer_size = 2000;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '2000'
SET @@session.sort_buffer_size = DEFAULT;
-SELECT @@session.sort_buffer_size= 2097144 OR @@session.sort_buffer_size= 2097116;
-@@session.sort_buffer_size= 2097144 OR @@session.sort_buffer_size= 2097116
+SELECT @@session.sort_buffer_size >= 2097116 AND @@session.sort_buffer_size <
3000000;
+@@session.sort_buffer_size >= 2097116 AND @@session.sort_buffer_size < 3000000
1
'#--------------------FN_DYNVARS_151_02-------------------------#'
SET @@global.sort_buffer_size = DEFAULT;
-SELECT @@global.sort_buffer_size = 2097144 OR @@global.sort_buffer_size= 2097116;
-@@global.sort_buffer_size = 2097144 OR @@global.sort_buffer_size= 2097116
+SELECT @@global.sort_buffer_size >= 2097116 AND @@global.sort_buffer_size <
3000000;
+@@global.sort_buffer_size >= 2097116 AND @@global.sort_buffer_size < 3000000
1
SET @@session.sort_buffer_size = DEFAULT;
-SELECT @@session.sort_buffer_size = 2097144 OR @@session.sort_buffer_size= 2097116;
-@@session.sort_buffer_size = 2097144 OR @@session.sort_buffer_size= 2097116
+SELECT @@session.sort_buffer_size >= 2097116 AND @@session.sort_buffer_size <
3000000;
+@@session.sort_buffer_size >= 2097116 AND @@session.sort_buffer_size < 3000000
1
'#--------------------FN_DYNVARS_151_03-------------------------#'
SET @@global.sort_buffer_size = 32776;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '32776'
-SELECT @@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804;
-@@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804
+SELECT @@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000;
+@@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000
1
SET @@global.sort_buffer_size = 32777;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '32777'
-SELECT @@global.sort_buffer_size= 32777 OR @@global.sort_buffer_size= 32804;
-@@global.sort_buffer_size= 32777 OR @@global.sort_buffer_size= 32804
+SELECT @@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000;
+@@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000
1
SET @@global.sort_buffer_size = 4294967295;
SELECT @@global.sort_buffer_size;
@@ -51,19 +37,14 @@ SET @@global.sort_buffer_size = 42949672
SELECT @@global.sort_buffer_size;
@@global.sort_buffer_size
4294967294
-'Bug# 34877: Invalid Values are showing in variable on assigning valid values.';
'#--------------------FN_DYNVARS_151_04-------------------------#'
SET @@session.sort_buffer_size = 32776;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '32776'
-SELECT @@session.sort_buffer_size= 32776 OR @@session.sort_buffer_size= 32804;
-@@session.sort_buffer_size= 32776 OR @@session.sort_buffer_size= 32804
+SELECT @@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000;
+@@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000
1
SET @@session.sort_buffer_size = 32777;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '32777'
-SELECT @@session.sort_buffer_size= 32777 OR @@session.sort_buffer_size= 32804;
-@@session.sort_buffer_size= 32777 OR @@session.sort_buffer_size= 32804
+SELECT @@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000;
+@@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000
1
SET @@session.sort_buffer_size = 4294967295;
SELECT @@session.sort_buffer_size;
@@ -75,16 +56,12 @@ SELECT @@session.sort_buffer_size;
4294967294
'#------------------FN_DYNVARS_151_05-----------------------#'
SET @@global.sort_buffer_size = 32775;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '32775'
-SELECT @@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804;
-@@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804
+SELECT @@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000;
+@@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000
1
SET @@global.sort_buffer_size = -1024;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '0'
-SELECT @@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804;
-@@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804
+SELECT @@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000;
+@@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000
1
SET @@global.sort_buffer_size = 4294967296;
SELECT @@global.sort_buffer_size;
@@ -101,16 +78,12 @@ SELECT @@global.sort_buffer_size;
@@global.sort_buffer_size
4294967296
SET @@session.sort_buffer_size = 32775;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '32775'
-SELECT @@session.sort_buffer_size= 32776 OR @@session.sort_buffer_size= 32804;
-@@session.sort_buffer_size= 32776 OR @@session.sort_buffer_size= 32804
+SELECT @@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000;
+@@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000
1
SET @@session.sort_buffer_size = -2;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '0'
-SELECT @@session.sort_buffer_size= 32776 OR @@session.sort_buffer_size= 32804;
-@@session.sort_buffer_size= 32776 OR @@session.sort_buffer_size= 32804
+SELECT @@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000;
+@@session.sort_buffer_size >= 32776 AND @@session.sort_buffer_size < 33000
1
SET @@session.sort_buffer_size = 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
@@ -118,45 +91,34 @@ SET @@session.sort_buffer_size = 4294967
SELECT @@session.sort_buffer_size;
@@session.sort_buffer_size
4294967296
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
SET @@session.sort_buffer_size = test;
ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-4294967296
'#------------------FN_DYNVARS_151_06-----------------------#'
-SELECT @@global.sort_buffer_size = VARIABLE_VALUE FROM
INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size';
+SELECT @@global.sort_buffer_size = VARIABLE_VALUE FROM
+INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size';
@@global.sort_buffer_size = VARIABLE_VALUE
1
'#------------------FN_DYNVARS_151_07-----------------------#'
-SELECT @@session.sort_buffer_size = VARIABLE_VALUE FROM
INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size';
+SELECT @@session.sort_buffer_size = VARIABLE_VALUE FROM
+INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size';
@@session.sort_buffer_size = VARIABLE_VALUE
1
'#------------------FN_DYNVARS_151_08-----------------------#'
SET @@global.sort_buffer_size = TRUE;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '1'
-SELECT @@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804;
-@@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804
+SELECT @@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000;
+@@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000
1
SET @@global.sort_buffer_size = FALSE;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '0'
-SELECT @@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804;
-@@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804
+SELECT @@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000;
+@@global.sort_buffer_size >= 32776 AND @@global.sort_buffer_size < 33000
1
-'Bug: Errors should be displayed on assigning TRUE/FALSE to variable'
'#---------------------FN_DYNVARS_151_09----------------------#'
SET @@global.sort_buffer_size = 9000;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '9000'
SELECT @@sort_buffer_size = @@global.sort_buffer_size;
@@sort_buffer_size = @@global.sort_buffer_size
0
'#---------------------FN_DYNVARS_151_10----------------------#'
SET @@sort_buffer_size = 9000;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '9000'
SELECT @@sort_buffer_size = @@local.sort_buffer_size;
@@sort_buffer_size = @@local.sort_buffer_size
1
@@ -165,14 +127,9 @@ SELECT @@local.sort_buffer_size = @@sess
1
'#---------------------FN_DYNVARS_151_11----------------------#'
SET sort_buffer_size = 9100;
-Warnings:
-Warning 1292 Truncated incorrect sort_buffer_size value: '9100'
-SELECT @sort_buffer_size= 32776 OR @@sort_buffer_size= 32804;
-@sort_buffer_size= 32776 OR @@sort_buffer_size= 32804
-1
-SELECT @@sort_buffer_size;
-@@sort_buffer_size
-32804
+SELECT @@sort_buffer_size >= 32776 AND @@sort_buffer_size < 33000;
+@@sort_buffer_size >= 32776 AND @@sort_buffer_size < 33000
+1
SELECT local.sort_buffer_size;
ERROR 42S02: Unknown table 'local' in field list
SELECT session.sort_buffer_size;
@@ -180,10 +137,4 @@ ERROR 42S02: Unknown table 'session' in
SELECT sort_buffer_size = @@session.sort_buffer_size;
ERROR 42S22: Unknown column 'sort_buffer_size' in 'field list'
SET @@global.sort_buffer_size = @start_global_value;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-262144
SET @@session.sort_buffer_size = @start_session_value;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-262144
=== added file 'mysql-test/suite/sys_vars/r/tmp_table_size_basic.result'
--- a/mysql-test/suite/sys_vars/r/tmp_table_size_basic.result 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/r/tmp_table_size_basic.result 2008-12-05 15:43:13 +0000
@@ -0,0 +1,146 @@
+SET @start_global_value = @@global.tmp_table_size;
+SET @start_session_value = @@session.tmp_table_size;
+'#--------------------FN_DYNVARS_005_01-------------------------#'
+SET @@global.tmp_table_size = 100;
+Warnings:
+Warning 1292 Truncated incorrect tmp_table_size value: '100'
+SET @@global.tmp_table_size = DEFAULT;
+SET @@session.tmp_table_size = 200;
+Warnings:
+Warning 1292 Truncated incorrect tmp_table_size value: '200'
+SET @@session.tmp_table_size = DEFAULT;
+'#--------------------FN_DYNVARS_005_02-------------------------#'
+SELECT @@global.tmp_table_size >= 16777216;
+@@global.tmp_table_size >= 16777216
+1
+SELECT @@session.tmp_table_size >= 16777216;
+@@session.tmp_table_size >= 16777216
+1
+'#--------------------FN_DYNVARS_005_03-------------------------#'
+SET @@global.tmp_table_size = 1024;
+SELECT @@global.tmp_table_size;
+@@global.tmp_table_size
+1024
+SET @@global.tmp_table_size = 60020;
+SELECT @@global.tmp_table_size;
+@@global.tmp_table_size
+60020
+SET @@global.tmp_table_size = 4294967295;
+SELECT @@global.tmp_table_size;
+@@global.tmp_table_size
+4294967295
+'#--------------------FN_DYNVARS_005_04-------------------------#'
+SET @@session.tmp_table_size = 1024;
+SELECT @@session.tmp_table_size;
+@@session.tmp_table_size
+1024
+SET @@session.tmp_table_size = 4294967295;
+SELECT @@session.tmp_table_size;
+@@session.tmp_table_size
+4294967295
+SET @@session.tmp_table_size = 65535;
+SELECT @@session.tmp_table_size;
+@@session.tmp_table_size
+65535
+'#------------------FN_DYNVARS_005_05-----------------------#'
+SET @@global.tmp_table_size = 0;
+Warnings:
+Warning 1292 Truncated incorrect tmp_table_size value: '0'
+SELECT @@global.tmp_table_size;
+@@global.tmp_table_size
+1024
+SET @@global.tmp_table_size = -1024;
+Warnings:
+Warning 1292 Truncated incorrect tmp_table_size value: '0'
+SELECT @@global.tmp_table_size;
+@@global.tmp_table_size
+1024
+SET @@global.tmp_table_size = 1000;
+Warnings:
+Warning 1292 Truncated incorrect tmp_table_size value: '1000'
+SELECT @@global.tmp_table_size;
+@@global.tmp_table_size
+1024
+SET @@global.tmp_table_size = ON;
+ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
+SET @@global.tmp_table_size = OFF;
+ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
+SET @@global.tmp_table_size = True;
+Warnings:
+Warning 1292 Truncated incorrect tmp_table_size value: '1'
+SELECT @@global.tmp_table_size;
+@@global.tmp_table_size
+1024
+SET @@global.tmp_table_size = False;
+Warnings:
+Warning 1292 Truncated incorrect tmp_table_size value: '0'
+SELECT @@global.tmp_table_size;
+@@global.tmp_table_size
+1024
+SET @@global.tmp_table_size = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
+SET @@global.tmp_table_size ="Test";
+ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
+SET @@session.tmp_table_size = ON;
+ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
+SET @@session.tmp_table_size = OFF;
+ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
+SET @@session.tmp_table_size = True;
+Warnings:
+Warning 1292 Truncated incorrect tmp_table_size value: '1'
+SELECT @@session.tmp_table_size;
+@@session.tmp_table_size
+1024
+SET @@session.tmp_table_size = False;
+Warnings:
+Warning 1292 Truncated incorrect tmp_table_size value: '0'
+SELECT @@session.tmp_table_size;
+@@session.tmp_table_size
+1024
+SET @@session.tmp_table_size = "Test";
+ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
+SET @@session.tmp_table_size = 12345678901;
+SELECT @@session.tmp_table_size IN (12345678901,4294967295);
+@@session.tmp_table_size IN (12345678901,4294967295)
+1
+'#------------------FN_DYNVARS_005_06-----------------------#'
+SELECT @@global.tmp_table_size = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='tmp_table_size';
+@@global.tmp_table_size = VARIABLE_VALUE
+1
+'#------------------FN_DYNVARS_005_07-----------------------#'
+SELECT @@session.tmp_table_size = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES
+WHERE VARIABLE_NAME='tmp_table_size';
+@@session.tmp_table_size = VARIABLE_VALUE
+1
+'#---------------------FN_DYNVARS_001_09----------------------#'
+SET @@global.tmp_table_size = 1024;
+SET @@tmp_table_size = 4294967295;
+SELECT @@tmp_table_size = @@global.tmp_table_size;
+@@tmp_table_size = @@global.tmp_table_size
+0
+'#---------------------FN_DYNVARS_001_10----------------------#'
+SET @@tmp_table_size = 100;
+Warnings:
+Warning 1292 Truncated incorrect tmp_table_size value: '100'
+SELECT @@tmp_table_size = @@local.tmp_table_size;
+@@tmp_table_size = @@local.tmp_table_size
+1
+SELECT @@local.tmp_table_size = @@session.tmp_table_size;
+@@local.tmp_table_size = @@session.tmp_table_size
+1
+'#---------------------FN_DYNVARS_001_11----------------------#'
+SET tmp_table_size = 1027;
+SELECT @@tmp_table_size;
+@@tmp_table_size
+1027
+SELECT local.tmp_table_size;
+ERROR 42S02: Unknown table 'local' in field list
+SELECT global.tmp_table_size;
+ERROR 42S02: Unknown table 'global' in field list
+SELECT tmp_table_size = @@session.tmp_table_size;
+ERROR 42S22: Unknown column 'tmp_table_size' in 'field list'
+SET @@global.tmp_table_size = @start_global_value;
+SET @@session.tmp_table_size = @start_session_value;
=== removed file 'mysql-test/suite/sys_vars/r/tmp_table_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/tmp_table_size_basic_32.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/tmp_table_size_basic_32.result 1970-01-01 00:00:00 +0000
@@ -1,172 +0,0 @@
-SET @start_global_value = @@global.tmp_table_size;
-SELECT @start_global_value;
-@start_global_value
-16777216
-SET @start_session_value = @@session.tmp_table_size;
-SELECT @start_session_value;
-@start_session_value
-16777216
-'Bug# 34876: This variable has invalid default value as compared to documentation';
-'#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.tmp_table_size = 100;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '100'
-SET @@global.tmp_table_size = DEFAULT;
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-16777216
-'Bug# 34876: This variable has invalid default value as compared to documentation';
-SET @@session.tmp_table_size = 200;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '200'
-SET @@session.tmp_table_size = DEFAULT;
-SELECT @@session.tmp_table_size;
-@@session.tmp_table_size
-16777216
-'Bug# 34876: This variable has invalid default value as compared to documentation';
-'#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.tmp_table_size = DEFAULT;
-SELECT @@global.tmp_table_size = 33554432;
-@@global.tmp_table_size = 33554432
-0
-SET @@session.tmp_table_size = DEFAULT;
-SELECT @@session.tmp_table_size = 33554432;
-@@session.tmp_table_size = 33554432
-0
-'Bug# 34876: This variable has invalid default value as compared to documentation';
-'#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@global.tmp_table_size = 1024;
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-1024
-SET @@global.tmp_table_size = 60020;
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-60020
-SET @@global.tmp_table_size = 4294967295;
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-4294967295
-'#--------------------FN_DYNVARS_005_04-------------------------#'
-SET @@session.tmp_table_size = 1024;
-SELECT @@session.tmp_table_size;
-@@session.tmp_table_size
-1024
-SET @@session.tmp_table_size =4294967295;
-SELECT @@session.tmp_table_size;
-@@session.tmp_table_size
-4294967295
-SET @@session.tmp_table_size = 65535;
-SELECT @@session.tmp_table_size;
-@@session.tmp_table_size
-65535
-'#------------------FN_DYNVARS_005_05-----------------------#'
-SET @@global.tmp_table_size = 0;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '0'
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-1024
-SET @@global.tmp_table_size = -1024;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '0'
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-1024
-SET @@global.tmp_table_size = 1000;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '1000'
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-1024
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
-SET @@global.tmp_table_size = ON;
-ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
-SET @@global.tmp_table_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
-SET @@global.tmp_table_size = True;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '1'
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-1024
-SET @@global.tmp_table_size = False;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '0'
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-1024
-'Bug:Error should be shown that variable is numeric and can not assigned boolean value';
-SET @@global.tmp_table_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
-SET @@global.tmp_table_size ="Test";
-ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
-SET @@session.tmp_table_size = ON;
-ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
-SET @@session.tmp_table_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
-SET @@session.tmp_table_size = True;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '1'
-SELECT @@session.tmp_table_size;
-@@session.tmp_table_size
-1024
-SET @@session.tmp_table_size = False;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '0'
-SELECT @@session.tmp_table_size;
-@@session.tmp_table_size
-1024
-SET @@session.tmp_table_size = "Test";
-ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
-SET @@session.tmp_table_size = 12345678901;
-SELECT @@session.tmp_table_size;
-@@session.tmp_table_size
-4294967295
-'#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@global.tmp_table_size = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='tmp_table_size';
-@@global.tmp_table_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_07-----------------------#'
-SELECT @@session.tmp_table_size = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='tmp_table_size';
-@@session.tmp_table_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@global.tmp_table_size = 1024;
-SET @@tmp_table_size = 4294967295;
-SELECT @@tmp_table_size = @@global.tmp_table_size;
-@@tmp_table_size = @@global.tmp_table_size
-0
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET @@tmp_table_size = 100;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '100'
-SELECT @@tmp_table_size = @@local.tmp_table_size;
-@@tmp_table_size = @@local.tmp_table_size
-1
-SELECT @@local.tmp_table_size = @@session.tmp_table_size;
-@@local.tmp_table_size = @@session.tmp_table_size
-1
-'#---------------------FN_DYNVARS_001_11----------------------#'
-SET tmp_table_size = 1027;
-SELECT @@tmp_table_size;
-@@tmp_table_size
-1027
-SELECT local.tmp_table_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT global.tmp_table_size;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT tmp_table_size = @@session.tmp_table_size;
-ERROR 42S22: Unknown column 'tmp_table_size' in 'field list'
-SET @@global.tmp_table_size = @start_global_value;
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-16777216
-SET @@session.tmp_table_size = @start_session_value;
-SELECT @@session.tmp_table_size;
-@@session.tmp_table_size
-16777216
=== removed file 'mysql-test/suite/sys_vars/r/tmp_table_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/tmp_table_size_basic_64.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/tmp_table_size_basic_64.result 1970-01-01 00:00:00 +0000
@@ -1,172 +0,0 @@
-SET @start_global_value = @@global.tmp_table_size;
-SELECT @start_global_value;
-@start_global_value
-16777216
-SET @start_session_value = @@session.tmp_table_size;
-SELECT @start_session_value;
-@start_session_value
-16777216
-'Bug# 34876: This variable has invalid default value as compared to documentation';
-'#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.tmp_table_size = 100;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '100'
-SET @@global.tmp_table_size = DEFAULT;
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-16777216
-'Bug# 34876: This variable has invalid default value as compared to documentation';
-SET @@session.tmp_table_size = 200;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '200'
-SET @@session.tmp_table_size = DEFAULT;
-SELECT @@session.tmp_table_size;
-@@session.tmp_table_size
-16777216
-'Bug# 34876: This variable has invalid default value as compared to documentation';
-'#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.tmp_table_size = DEFAULT;
-SELECT @@global.tmp_table_size = 33554432;
-@@global.tmp_table_size = 33554432
-0
-SET @@session.tmp_table_size = DEFAULT;
-SELECT @@session.tmp_table_size = 33554432;
-@@session.tmp_table_size = 33554432
-0
-'Bug# 34876: This variable has invalid default value as compared to documentation';
-'#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@global.tmp_table_size = 1024;
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-1024
-SET @@global.tmp_table_size = 60020;
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-60020
-SET @@global.tmp_table_size = 4294967295;
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-4294967295
-'#--------------------FN_DYNVARS_005_04-------------------------#'
-SET @@session.tmp_table_size = 1024;
-SELECT @@session.tmp_table_size;
-@@session.tmp_table_size
-1024
-SET @@session.tmp_table_size =4294967295;
-SELECT @@session.tmp_table_size;
-@@session.tmp_table_size
-4294967295
-SET @@session.tmp_table_size = 65535;
-SELECT @@session.tmp_table_size;
-@@session.tmp_table_size
-65535
-'#------------------FN_DYNVARS_005_05-----------------------#'
-SET @@global.tmp_table_size = 0;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '0'
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-1024
-SET @@global.tmp_table_size = -1024;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '0'
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-1024
-SET @@global.tmp_table_size = 1000;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '1000'
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-1024
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
-SET @@global.tmp_table_size = ON;
-ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
-SET @@global.tmp_table_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
-SET @@global.tmp_table_size = True;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '1'
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-1024
-SET @@global.tmp_table_size = False;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '0'
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-1024
-'Bug:Error should be shown that variable is numeric and can not assigned boolean value';
-SET @@global.tmp_table_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
-SET @@global.tmp_table_size ="Test";
-ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
-SET @@session.tmp_table_size = ON;
-ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
-SET @@session.tmp_table_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
-SET @@session.tmp_table_size = True;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '1'
-SELECT @@session.tmp_table_size;
-@@session.tmp_table_size
-1024
-SET @@session.tmp_table_size = False;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '0'
-SELECT @@session.tmp_table_size;
-@@session.tmp_table_size
-1024
-SET @@session.tmp_table_size = "Test";
-ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
-SET @@session.tmp_table_size = 12345678901;
-SELECT @@session.tmp_table_size;
-@@session.tmp_table_size
-12345678901
-'#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@global.tmp_table_size = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='tmp_table_size';
-@@global.tmp_table_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_07-----------------------#'
-SELECT @@session.tmp_table_size = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='tmp_table_size';
-@@session.tmp_table_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@global.tmp_table_size = 1024;
-SET @@tmp_table_size = 4294967295;
-SELECT @@tmp_table_size = @@global.tmp_table_size;
-@@tmp_table_size = @@global.tmp_table_size
-0
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET @@tmp_table_size = 100;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '100'
-SELECT @@tmp_table_size = @@local.tmp_table_size;
-@@tmp_table_size = @@local.tmp_table_size
-1
-SELECT @@local.tmp_table_size = @@session.tmp_table_size;
-@@local.tmp_table_size = @@session.tmp_table_size
-1
-'#---------------------FN_DYNVARS_001_11----------------------#'
-SET tmp_table_size = 1027;
-SELECT @@tmp_table_size;
-@@tmp_table_size
-1027
-SELECT local.tmp_table_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT global.tmp_table_size;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT tmp_table_size = @@session.tmp_table_size;
-ERROR 42S22: Unknown column 'tmp_table_size' in 'field list'
-SET @@global.tmp_table_size = @start_global_value;
-SELECT @@global.tmp_table_size;
-@@global.tmp_table_size
-16777216
-SET @@session.tmp_table_size = @start_session_value;
-SELECT @@session.tmp_table_size;
-@@session.tmp_table_size
-16777216
=== added file 'mysql-test/suite/sys_vars/t/tmp_table_size_basic.test'
--- a/mysql-test/suite/sys_vars/t/tmp_table_size_basic.test 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/t/tmp_table_size_basic.test 2008-12-05 15:43:13 +0000
@@ -0,0 +1,206 @@
+########################### tmp_table_size_basic.test ##########################
+# #
+# Variable Name: tmp_table_size #
+# Scope: GLOBAL | SESSION #
+# Access Type: Dynamic #
+# Data Type: numeric #
+# Default Value: system dependend #
+# Range: 1024-system dependend #
+# #
+# #
+# Creation Date: 2008-02-13 #
+# Author: Salman #
+# #
+# Description: Test Cases of Dynamic System Variable tmp_table_size #
+# that checks the behavior of this variable in the following ways #
+# * Default Value #
+# * Valid & Invalid values #
+# * Scope & Access method #
+# * Data Integrity #
+# Modified: 2008-12-04 HHunger #
+# removed the differences between 64 and 32 bit platforms #
+# #
+# Reference: #
+# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html #
+# #
+################################################################################
+
+--source include/load_sysvars.inc
+
+##############################################################
+# START OF tmp_table_size TESTS #
+##############################################################
+
+#############################################################
+# Save initial value #
+#############################################################
+
+SET @start_global_value = @@global.tmp_table_size;
+SET @start_session_value = @@session.tmp_table_size;
+
+--echo '#--------------------FN_DYNVARS_005_01-------------------------#'
+##############################################################
+# Display the DEFAULT value of tmp_table_size #
+##############################################################
+
+SET @@global.tmp_table_size = 100;
+SET @@global.tmp_table_size = DEFAULT;
+
+SET @@session.tmp_table_size = 200;
+SET @@session.tmp_table_size = DEFAULT;
+
+--echo '#--------------------FN_DYNVARS_005_02-------------------------#'
+########################################################################
+# Check the DEFAULT value of tmp_table_size #
+########################################################################
+# The DEFAULT value is system dependend.
+# Therefore we have only a plausibility check here
+SELECT @@global.tmp_table_size >= 16777216;
+
+SELECT @@session.tmp_table_size >= 16777216;
+
+--echo '#--------------------FN_DYNVARS_005_03-------------------------#'
+########################################################################
+# Change the value of tmp_table_size to a valid value for GLOBAL Scope #
+########################################################################
+
+SET @@global.tmp_table_size = 1024;
+SELECT @@global.tmp_table_size;
+SET @@global.tmp_table_size = 60020;
+SELECT @@global.tmp_table_size;
+SET @@global.tmp_table_size = 4294967295;
+SELECT @@global.tmp_table_size;
+
+
+--echo '#--------------------FN_DYNVARS_005_04-------------------------#'
+#########################################################################
+# Change the value of tmp_table_size to a valid value for SESSION Scope #
+#########################################################################
+
+SET @@session.tmp_table_size = 1024;
+SELECT @@session.tmp_table_size;
+
+SET @@session.tmp_table_size = 4294967295;
+SELECT @@session.tmp_table_size;
+SET @@session.tmp_table_size = 65535;
+SELECT @@session.tmp_table_size;
+
+
+--echo '#------------------FN_DYNVARS_005_05-----------------------#'
+##########################################################
+# Change the value of tmp_table_size to an invalid value #
+##########################################################
+
+SET @@global.tmp_table_size = 0;
+SELECT @@global.tmp_table_size;
+
+SET @@global.tmp_table_size = -1024;
+SELECT @@global.tmp_table_size;
+
+SET @@global.tmp_table_size = 1000;
+SELECT @@global.tmp_table_size;
+
+--Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.tmp_table_size = ON;
+
+--Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.tmp_table_size = OFF;
+
+SET @@global.tmp_table_size = True;
+SELECT @@global.tmp_table_size;
+
+SET @@global.tmp_table_size = False;
+SELECT @@global.tmp_table_size;
+
+--Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.tmp_table_size = 65530.34;
+
+--Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.tmp_table_size ="Test";
+
+--Error ER_WRONG_TYPE_FOR_VAR
+SET @@session.tmp_table_size = ON;
+
+--Error ER_WRONG_TYPE_FOR_VAR
+SET @@session.tmp_table_size = OFF;
+
+SET @@session.tmp_table_size = True;
+SELECT @@session.tmp_table_size;
+
+SET @@session.tmp_table_size = False;
+SELECT @@session.tmp_table_size;
+
+--Error ER_WRONG_TYPE_FOR_VAR
+SET @@session.tmp_table_size = "Test";
+
+SET @@session.tmp_table_size = 12345678901;
+
+# With a 64 bit mysqld:12345678901,with a 32 bit mysqld: 4294967295
+SELECT @@session.tmp_table_size IN (12345678901,4294967295);
+
+--echo '#------------------FN_DYNVARS_005_06-----------------------#'
+####################################################################
+# Check if the value in GLOBAL Table matches value in variable #
+####################################################################
+
+SELECT @@global.tmp_table_size = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='tmp_table_size';
+
+--echo '#------------------FN_DYNVARS_005_07-----------------------#'
+####################################################################
+# Check if the value in SESSION Table matches value in variable #
+####################################################################
+
+SELECT @@session.tmp_table_size = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES
+WHERE VARIABLE_NAME='tmp_table_size';
+
+--echo '#---------------------FN_DYNVARS_001_09----------------------#'
+########################################################################
+# Check if global and session variables are independent of each other #
+########################################################################
+
+SET @@global.tmp_table_size = 1024;
+SET @@tmp_table_size = 4294967295;
+SELECT @@tmp_table_size = @@global.tmp_table_size;
+
+--echo '#---------------------FN_DYNVARS_001_10----------------------#'
+##################################################################
+# Check if accessing variable with SESSION,LOCAL and without #
+# SCOPE points to same session variable #
+##################################################################
+
+SET @@tmp_table_size = 100;
+SELECT @@tmp_table_size = @@local.tmp_table_size;
+SELECT @@local.tmp_table_size = @@session.tmp_table_size;
+
+
+--echo '#---------------------FN_DYNVARS_001_11----------------------#'
+#########################################################################
+# Check if tmp_table_size can be accessed with and without @@ sign #
+#########################################################################
+
+SET tmp_table_size = 1027;
+SELECT @@tmp_table_size;
+
+--Error ER_UNKNOWN_TABLE
+SELECT local.tmp_table_size;
+
+--Error ER_UNKNOWN_TABLE
+SELECT global.tmp_table_size;
+
+--Error ER_BAD_FIELD_ERROR
+SELECT tmp_table_size = @@session.tmp_table_size;
+
+####################################
+# Restore initial value #
+####################################
+
+SET @@global.tmp_table_size = @start_global_value;
+SET @@session.tmp_table_size = @start_session_value;
+
+###################################################
+# END OF tmp_table_size TESTS #
+###################################################
+
=== removed file 'mysql-test/suite/sys_vars/t/tmp_table_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/tmp_table_size_basic_32.test 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/tmp_table_size_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/tmp_table_size_basic.inc
-
=== removed file 'mysql-test/suite/sys_vars/t/tmp_table_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/tmp_table_size_basic_64.test 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/tmp_table_size_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/tmp_table_size_basic.inc
-
=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def 2008-12-08 14:36:42 +0000
+++ b/mysql-test/t/disabled.def 2008-12-09 16:34:31 +0000
@@ -12,3 +12,4 @@
federated_transactions : Bug#29523 Transactions do not work
slow_query_log_func : Bug #37962: *_func tests containing sleeps/race conditions
wait_timeout_func : Bug #41225 joro wait_timeout_func fails
+kill : Bug#37780 2008-12-03 HHunger need some changes to be robust
enoiugh for pushbuild.
| Thread | ||
|---|---|---|
| • bzr commit into mysql-5.1-bugteam branch (patrick.crews:2730) | Patrick Crews | 9 Dec |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 1.169 sec. using MySQL 5.1.14-beta-log