database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix for Bug#36878 after review by Matthias: Only one line in the result files of 32 bit and 64 bit platforms differed and made problems on 64 bit machine with 32 bit mysqld. The removal of the separation into 32 bit and 64 bit versions of that test fixes also this problem.

Browse Source
This commit is contained in:
Horst Hunger
2008-12-05 16:43:13 +01:00
parent 120cfcacb8
commit 7586134814
5 changed files with 60 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
mysql-test/suite/sys_vars/r/tmp_table_size_basic_32.result → mysql-test/suite/sys_vars/r/tmp_table_size_basic.result
View File

@ -1,35 +1,21 @@
SET @start_global_value = @@global.tmp_table_size; SET @start_global_value = @@global.tmp_table_size;
SELECT @start_global_value;
@start_global_value
16777216
SET @start_session_value = @@session.tmp_table_size; SET @start_session_value = @@session.tmp_table_size;
SELECT @start_session_value;
@start_session_value
16777216
'#--------------------FN_DYNVARS_005_01-------------------------#' '#--------------------FN_DYNVARS_005_01-------------------------#'
SET @@global.tmp_table_size = 100; SET @@global.tmp_table_size = 100;
Warnings: Warnings:
Warning 1292 Truncated incorrect tmp_table_size value: '100' Warning 1292 Truncated incorrect tmp_table_size value: '100'
SET @@global.tmp_table_size = DEFAULT; SET @@global.tmp_table_size = DEFAULT;
SELECT @@global.tmp_table_size;
@@global.tmp_table_size
16777216
SET @@session.tmp_table_size = 200; SET @@session.tmp_table_size = 200;
Warnings: Warnings:
Warning 1292 Truncated incorrect tmp_table_size value: '200' Warning 1292 Truncated incorrect tmp_table_size value: '200'
SET @@session.tmp_table_size = DEFAULT; SET @@session.tmp_table_size = DEFAULT;
SELECT @@session.tmp_table_size;
@@session.tmp_table_size
16777216
'#--------------------FN_DYNVARS_005_02-------------------------#' '#--------------------FN_DYNVARS_005_02-------------------------#'
SET @@global.tmp_table_size = DEFAULT; SELECT @@global.tmp_table_size >= 16777216;
SELECT @@global.tmp_table_size = 33554432; @@global.tmp_table_size >= 16777216
@@global.tmp_table_size = 33554432 1
0 SELECT @@session.tmp_table_size >= 16777216;
SET @@session.tmp_table_size = DEFAULT; @@session.tmp_table_size >= 16777216
SELECT @@session.tmp_table_size = 33554432; 1
@@session.tmp_table_size = 33554432
0
'#--------------------FN_DYNVARS_005_03-------------------------#' '#--------------------FN_DYNVARS_005_03-------------------------#'
SET @@global.tmp_table_size = 1024; SET @@global.tmp_table_size = 1024;
SELECT @@global.tmp_table_size; SELECT @@global.tmp_table_size;
@ -48,7 +34,7 @@ SET @@session.tmp_table_size = 1024;
SELECT @@session.tmp_table_size; SELECT @@session.tmp_table_size;
@@session.tmp_table_size @@session.tmp_table_size
1024 1024
SET @@session.tmp_table_size =4294967295; SET @@session.tmp_table_size = 4294967295;
SELECT @@session.tmp_table_size; SELECT @@session.tmp_table_size;
@@session.tmp_table_size @@session.tmp_table_size
4294967295 4294967295
@ -114,9 +100,9 @@ SELECT @@session.tmp_table_size;
SET @@session.tmp_table_size = "Test"; SET @@session.tmp_table_size = "Test";
ERROR 42000: Incorrect argument type to variable 'tmp_table_size' ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
SET @@session.tmp_table_size = 12345678901; SET @@session.tmp_table_size = 12345678901;
SELECT @@session.tmp_table_size; SELECT @@session.tmp_table_size IN (12345678901,4294967295);
@@session.tmp_table_size @@session.tmp_table_size IN (12345678901,4294967295)
4294967295 1
'#------------------FN_DYNVARS_005_06-----------------------#' '#------------------FN_DYNVARS_005_06-----------------------#'
SELECT @@global.tmp_table_size = VARIABLE_VALUE SELECT @@global.tmp_table_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
@ -157,10 +143,4 @@ ERROR 42S02: Unknown table 'global' in field list
SELECT tmp_table_size = @@session.tmp_table_size; SELECT tmp_table_size = @@session.tmp_table_size;
ERROR 42S22: Unknown column 'tmp_table_size' in 'field list' ERROR 42S22: Unknown column 'tmp_table_size' in 'field list'
SET @@global.tmp_table_size = @start_global_value; 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; SET @@session.tmp_table_size = @start_session_value;
SELECT @@session.tmp_table_size;
@@session.tmp_table_size
16777216

166
mysql-test/suite/sys_vars/r/tmp_table_size_basic_64.result
View File

@ -1,166 +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
'#--------------------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
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
'#--------------------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
'#--------------------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;
@@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

47
mysql-test/suite/sys_vars/inc/tmp_table_size_basic.inc → mysql-test/suite/sys_vars/t/tmp_table_size_basic.test
View File

@ -1,27 +1,29 @@
############## mysql-test\t\tmp_table_size_basic.test ######################### ########################### tmp_table_size_basic.test ##########################
# # # #
# Variable Name: tmp_table_size # # Variable Name: tmp_table_size #
# Scope: GLOBAL | SESSION # # Scope: GLOBAL | SESSION #
# Access Type: Dynamic # # Access Type: Dynamic #
# Data Type: numeric # # Data Type: numeric #
# Default Value: 33554432 # # Default Value: system dependend #
# Range: 1024-4294967295 # # Range: 1024-system dependend #
# # # #
# # # #
# Creation Date: 2008-02-13 # # Creation Date: 2008-02-13 #
# Author: Salman # # Author: Salman #
# # # #
# Description: Test Cases of Dynamic System Variable tmp_table_size # # Description: Test Cases of Dynamic System Variable tmp_table_size #
# that checks the behavior of this variable in the following ways# # that checks the behavior of this variable in the following ways #
# * Default Value # # * Default Value #
# * Valid & Invalid values # # * Valid & Invalid values #
# * Scope & Access method # # * Scope & Access method #
# * Data Integrity # # * Data Integrity #
# Modified: 2008-12-04 HHunger #
# removed the differences between 64 and 32 bit platforms #
# # # #
# Reference: # # Reference: #
# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html # # http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html #
# # # #
############################################################################### ################################################################################
--source include/load_sysvars.inc --source include/load_sysvars.inc
@ -34,9 +36,7 @@
############################################################# #############################################################
SET @start_global_value = @@global.tmp_table_size; SET @start_global_value = @@global.tmp_table_size;
SELECT @start_global_value;
SET @start_session_value = @@session.tmp_table_size; SET @start_session_value = @@session.tmp_table_size;
SELECT @start_session_value;
--echo '#--------------------FN_DYNVARS_005_01-------------------------#' --echo '#--------------------FN_DYNVARS_005_01-------------------------#'
############################################################## ##############################################################
@ -45,22 +45,19 @@ SELECT @start_session_value;
SET @@global.tmp_table_size = 100; SET @@global.tmp_table_size = 100;
SET @@global.tmp_table_size = DEFAULT; SET @@global.tmp_table_size = DEFAULT;
SELECT @@global.tmp_table_size;
SET @@session.tmp_table_size = 200; SET @@session.tmp_table_size = 200;
SET @@session.tmp_table_size = DEFAULT; SET @@session.tmp_table_size = DEFAULT;
SELECT @@session.tmp_table_size;
--echo '#--------------------FN_DYNVARS_005_02-------------------------#' --echo '#--------------------FN_DYNVARS_005_02-------------------------#'
######################################################################## ########################################################################
# Check the DEFAULT value of tmp_table_size # # 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;
SET @@global.tmp_table_size = DEFAULT; SELECT @@session.tmp_table_size >= 16777216;
SELECT @@global.tmp_table_size = 33554432;
SET @@session.tmp_table_size = DEFAULT;
SELECT @@session.tmp_table_size = 33554432;
--echo '#--------------------FN_DYNVARS_005_03-------------------------#' --echo '#--------------------FN_DYNVARS_005_03-------------------------#'
######################################################################## ########################################################################
@ -83,7 +80,7 @@ SELECT @@global.tmp_table_size;
SET @@session.tmp_table_size = 1024; SET @@session.tmp_table_size = 1024;
SELECT @@session.tmp_table_size; SELECT @@session.tmp_table_size;
SET @@session.tmp_table_size =4294967295; SET @@session.tmp_table_size = 4294967295;
SELECT @@session.tmp_table_size; SELECT @@session.tmp_table_size;
SET @@session.tmp_table_size = 65535; SET @@session.tmp_table_size = 65535;
SELECT @@session.tmp_table_size; SELECT @@session.tmp_table_size;
@ -103,10 +100,10 @@ SELECT @@global.tmp_table_size;
SET @@global.tmp_table_size = 1000; SET @@global.tmp_table_size = 1000;
SELECT @@global.tmp_table_size; SELECT @@global.tmp_table_size;
-- Error ER_WRONG_TYPE_FOR_VAR --Error ER_WRONG_TYPE_FOR_VAR
SET @@global.tmp_table_size = ON; SET @@global.tmp_table_size = ON;
-- Error ER_WRONG_TYPE_FOR_VAR --Error ER_WRONG_TYPE_FOR_VAR
SET @@global.tmp_table_size = OFF; SET @@global.tmp_table_size = OFF;
SET @@global.tmp_table_size = True; SET @@global.tmp_table_size = True;
@ -115,16 +112,16 @@ SELECT @@global.tmp_table_size;
SET @@global.tmp_table_size = False; SET @@global.tmp_table_size = False;
SELECT @@global.tmp_table_size; SELECT @@global.tmp_table_size;
-- Error ER_WRONG_TYPE_FOR_VAR --Error ER_WRONG_TYPE_FOR_VAR
SET @@global.tmp_table_size = 65530.34; SET @@global.tmp_table_size = 65530.34;
-- Error ER_WRONG_TYPE_FOR_VAR --Error ER_WRONG_TYPE_FOR_VAR
SET @@global.tmp_table_size ="Test"; SET @@global.tmp_table_size ="Test";
-- Error ER_WRONG_TYPE_FOR_VAR --Error ER_WRONG_TYPE_FOR_VAR
SET @@session.tmp_table_size = ON; SET @@session.tmp_table_size = ON;
-- Error ER_WRONG_TYPE_FOR_VAR --Error ER_WRONG_TYPE_FOR_VAR
SET @@session.tmp_table_size = OFF; SET @@session.tmp_table_size = OFF;
SET @@session.tmp_table_size = True; SET @@session.tmp_table_size = True;
@ -133,11 +130,13 @@ SELECT @@session.tmp_table_size;
SET @@session.tmp_table_size = False; SET @@session.tmp_table_size = False;
SELECT @@session.tmp_table_size; SELECT @@session.tmp_table_size;
-- Error ER_WRONG_TYPE_FOR_VAR --Error ER_WRONG_TYPE_FOR_VAR
SET @@session.tmp_table_size = "Test"; SET @@session.tmp_table_size = "Test";
SET @@session.tmp_table_size = 12345678901; SET @@session.tmp_table_size = 12345678901;
SELECT @@session.tmp_table_size;
# 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-----------------------#' --echo '#------------------FN_DYNVARS_005_06-----------------------#'
#################################################################### ####################################################################
@ -199,9 +198,7 @@ SELECT tmp_table_size = @@session.tmp_table_size;
#################################### ####################################
SET @@global.tmp_table_size = @start_global_value; SET @@global.tmp_table_size = @start_global_value;
SELECT @@global.tmp_table_size;
SET @@session.tmp_table_size = @start_session_value; SET @@session.tmp_table_size = @start_session_value;
SELECT @@session.tmp_table_size;
################################################### ###################################################
# END OF tmp_table_size TESTS # # END OF tmp_table_size TESTS #

9
mysql-test/suite/sys_vars/t/tmp_table_size_basic_32.test
View File

@ -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

9
mysql-test/suite/sys_vars/t/tmp_table_size_basic_64.test
View File

@ -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