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

MDEV-6107 merge default_tmp_storage_engine

Browse Source 
Adapt default_tmp_storage_engine implementation from mysql-5.6
New feature (as compared to 5.6), default_tmp_storage_engine=NULL
means that temporary tables will use default_storage_engine value.
This makes the behavior backward compatible.
This commit is contained in:
Sergei Golubchik
2014-06-14 22:15:52 +02:00
parent 2edcf8f9ff
commit cf1a09e42f
17 changed files with 516 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/lib/mtr_cases.pm
View File

@ -36,7 +36,6 @@ our $do_test;
our $skip_test;
our $binlog_format;
our $enable_disabled;
our $default_storage_engine;
our $opt_with_ndbcluster_only;
sub collect_option {

4
mysql-test/r/mysqld--help.result
View File

@ -144,6 +144,9 @@ The following options may be given as the first argument:
The default storage engine for new tables
--default-time-zone=name
Set the default time zone.
--default-tmp-storage-engine=name
The default storage engine for user-created temporary
tables
--default-week-format=#
The default week format used by WEEK() functions
--delay-key-write[=name]
@ -1085,6 +1088,7 @@ deadlock-timeout-short 10000
default-regex-flags
default-storage-engine myisam
default-time-zone (No default value)
default-tmp-storage-engine (No default value)
default-week-format 0
delay-key-write ON
delayed-insert-limit 100

181
mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result Normal file
View File

@ -0,0 +1,181 @@
SET @start_global_value = @@global.default_tmp_storage_engine;
SELECT @start_global_value;
@start_global_value
NULL
SET @start_session_value = @@session.default_tmp_storage_engine;
SELECT @start_session_value;
@start_session_value
NULL
'#--------------------FN_DYNVARS_005_01-------------------------#'
SET @@global.default_tmp_storage_engine = MEMORY;
SET @@global.default_tmp_storage_engine = DEFAULT;
SELECT @@global.default_tmp_storage_engine;
@@global.default_tmp_storage_engine
NULL
SET @@session.default_tmp_storage_engine = MEMORY;
SET @@session.default_tmp_storage_engine = DEFAULT;
SELECT @@session.default_tmp_storage_engine;
@@session.default_tmp_storage_engine
NULL
'#--------------------FN_DYNVARS_005_02-------------------------#'
SET @@global.default_tmp_storage_engine = MYISAM;
SELECT @@global.default_tmp_storage_engine;
@@global.default_tmp_storage_engine
MyISAM
SET @@global.default_tmp_storage_engine = MERGE;
SELECT @@global.default_tmp_storage_engine;
@@global.default_tmp_storage_engine
MRG_MyISAM
SET @@global.default_tmp_storage_engine = MEMORY;
SELECT @@global.default_tmp_storage_engine;
@@global.default_tmp_storage_engine
MEMORY
'#--------------------FN_DYNVARS_005_03-------------------------#'
SET @@session.default_tmp_storage_engine = MYISAM;
SELECT @@session.default_tmp_storage_engine;
@@session.default_tmp_storage_engine
MyISAM
SET @@session.default_tmp_storage_engine = MERGE;
SELECT @@session.default_tmp_storage_engine;
@@session.default_tmp_storage_engine
MRG_MyISAM
SET @@session.default_tmp_storage_engine = MEMORY;
SELECT @@session.default_tmp_storage_engine;
@@session.default_tmp_storage_engine
MEMORY
'#------------------FN_DYNVARS_005_04-----------------------#'
SET @@global.default_tmp_storage_engine = 8199;
ERROR 42000: Incorrect argument type to variable 'default_tmp_storage_engine'
SET @@global.default_tmp_storage_engine = -1024;
ERROR 42000: Incorrect argument type to variable 'default_tmp_storage_engine'
SET @@global.default_tmp_storage_engine = 65530.34;
ERROR 42000: Incorrect argument type to variable 'default_tmp_storage_engine'
SET @@global.default_tmp_storage_engine = FILE;
ERROR 42000: Unknown storage engine 'FILE'
SET @@session.default_tmp_storage_engine = 8199;
ERROR 42000: Incorrect argument type to variable 'default_tmp_storage_engine'
SET @@session.default_tmp_storage_engine = 65530.34;
ERROR 42000: Incorrect argument type to variable 'default_tmp_storage_engine'
SET @@session.default_tmp_storage_engine = RECORD;
ERROR 42000: Unknown storage engine 'RECORD'
'#------------------FN_DYNVARS_005_05-----------------------#'
SELECT @@global.default_tmp_storage_engine =
VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='default_tmp_storage_engine';
@@global.default_tmp_storage_engine =
VARIABLE_VALUE
1
'#------------------FN_DYNVARS_005_06-----------------------#'
SELECT @@session.default_tmp_storage_engine =
VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='default_tmp_storage_engine';
@@session.default_tmp_storage_engine =
VARIABLE_VALUE
1
'#------------------FN_DYNVARS_005_07-----------------------#'
SET @@global.default_tmp_storage_engine = TRUE;
ERROR 42000: Incorrect argument type to variable 'default_tmp_storage_engine'
SET @@global.default_tmp_storage_engine = FALSE;
ERROR 42000: Incorrect argument type to variable 'default_tmp_storage_engine'
'#---------------------FN_DYNVARS_001_8----------------------#'
SET @@default_tmp_storage_engine = MYISAM;
SELECT @@default_tmp_storage_engine = @@local.default_tmp_storage_engine;
@@default_tmp_storage_engine = @@local.default_tmp_storage_engine
1
SELECT @@local.default_tmp_storage_engine = @@session.default_tmp_storage_engine;
@@local.default_tmp_storage_engine = @@session.default_tmp_storage_engine
1
'#---------------------FN_DYNVARS_001_9----------------------#'
SET default_tmp_storage_engine = MEMORY;
SELECT @@default_tmp_storage_engine;
@@default_tmp_storage_engine
MEMORY
SELECT local.default_tmp_storage_engine;
ERROR 42S02: Unknown table 'local' in field list
SELECT session.default_tmp_storage_engine;
ERROR 42S02: Unknown table 'session' in field list
SELECT default_tmp_storage_engine = @@session.default_tmp_storage_engine;
ERROR 42S22: Unknown column 'default_tmp_storage_engine' in 'field list'
SET @@default_tmp_storage_engine = @start_global_value;
SET default_tmp_storage_engine = MyISAM;
SET default_storage_engine = MyISAM;
CREATE TABLE t1 (a INT);
CREATE TEMPORARY TABLE t2 (b INT);
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TEMPORARY TABLE `t2` (
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1, t2;
SET default_storage_engine = MEMORY;
CREATE TABLE t1 (a INT);
CREATE TEMPORARY TABLE t2 (b INT);
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MEMORY DEFAULT CHARSET=latin1
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TEMPORARY TABLE `t2` (
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1, t2;
SET @@global.default_tmp_storage_engine = NULL;
SET @@session.default_tmp_storage_engine = NULL;
SET default_storage_engine = MEMORY;
CREATE TABLE t1 (a INT);
CREATE TEMPORARY TABLE t2 (b INT);
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MEMORY DEFAULT CHARSET=latin1
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TEMPORARY TABLE `t2` (
`b` int(11) DEFAULT NULL
) ENGINE=MEMORY DEFAULT CHARSET=latin1
DROP TABLE t1, t2;
SET default_storage_engine = MYISAM;
CREATE TABLE t1 (a INT);
CREATE TEMPORARY TABLE t2 (b INT);
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TEMPORARY TABLE `t2` (
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1, t2;
SET default_tmp_storage_engine = DEFAULT;
SET default_storage_engine = DEFAULT;
CREATE TABLE t1 (a INT);
CREATE TEMPORARY TABLE t2 (b INT);
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TEMPORARY TABLE `t2` (
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1, t2;
SET @@global.default_tmp_storage_engine = @start_global_value;
SELECT @@global.default_tmp_storage_engine;
@@global.default_tmp_storage_engine
NULL
SET @@session.default_tmp_storage_engine = @start_session_value;
SELECT @@session.default_tmp_storage_engine;
@@session.default_tmp_storage_engine
NULL

193
mysql-test/suite/sys_vars/t/default_tmp_storage_engine_basic.test Normal file
View File

@ -0,0 +1,193 @@
######################################################################
# START OF default_tmp_storage_engine TESTS #
######################################################################
#############################################################
# Save initial value #
#############################################################
SET @start_global_value = @@global.default_tmp_storage_engine;
SELECT @start_global_value;
SET @start_session_value = @@session.default_tmp_storage_engine;
SELECT @start_session_value;
--echo '#--------------------FN_DYNVARS_005_01-------------------------#'
######################################################################
# Display the DEFAULT value of default_tmp_storage_engine #
######################################################################
SET @@global.default_tmp_storage_engine = MEMORY;
SET @@global.default_tmp_storage_engine = DEFAULT;
SELECT @@global.default_tmp_storage_engine;
SET @@session.default_tmp_storage_engine = MEMORY;
SET @@session.default_tmp_storage_engine = DEFAULT;
SELECT @@session.default_tmp_storage_engine;
--echo '#--------------------FN_DYNVARS_005_02-------------------------#'
########################################################################
# Change the value of default_tmp_storage_engine to a valid value for GLOBAL Scope #
########################################################################
SET @@global.default_tmp_storage_engine = MYISAM;
SELECT @@global.default_tmp_storage_engine;
SET @@global.default_tmp_storage_engine = MERGE;
SELECT @@global.default_tmp_storage_engine;
SET @@global.default_tmp_storage_engine = MEMORY;
SELECT @@global.default_tmp_storage_engine;
--echo '#--------------------FN_DYNVARS_005_03-------------------------#'
#########################################################################
# Change the value of default_tmp_storage_engine to a valid value for SESSION Scope #
#########################################################################
SET @@session.default_tmp_storage_engine = MYISAM;
SELECT @@session.default_tmp_storage_engine;
SET @@session.default_tmp_storage_engine = MERGE;
SELECT @@session.default_tmp_storage_engine;
SET @@session.default_tmp_storage_engine = MEMORY;
SELECT @@session.default_tmp_storage_engine;
--echo '#------------------FN_DYNVARS_005_04-----------------------#'
##################################################################
# Change the value of default_tmp_storage_engine to an invalid value #
##################################################################
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.default_tmp_storage_engine = 8199;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.default_tmp_storage_engine = -1024;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.default_tmp_storage_engine = 65530.34;
--Error ER_UNKNOWN_STORAGE_ENGINE
SET @@global.default_tmp_storage_engine = FILE;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@session.default_tmp_storage_engine = 8199;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@session.default_tmp_storage_engine = 65530.34;
--Error ER_UNKNOWN_STORAGE_ENGINE
SET @@session.default_tmp_storage_engine = RECORD;
--echo '#------------------FN_DYNVARS_005_05-----------------------#'
####################################################################
# Check if the value in GLOBAL Table matches value in variable #
####################################################################
SELECT @@global.default_tmp_storage_engine =
VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='default_tmp_storage_engine';
--echo '#------------------FN_DYNVARS_005_06-----------------------#'
####################################################################
# Check if the value in SESSION Table matches value in variable #
####################################################################
SELECT @@session.default_tmp_storage_engine =
VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='default_tmp_storage_engine';
--echo '#------------------FN_DYNVARS_005_07-----------------------#'
####################################################################
# Check if TRUE and FALSE values can be used on variable #
####################################################################
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.default_tmp_storage_engine = TRUE;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.default_tmp_storage_engine = FALSE;
--echo '#---------------------FN_DYNVARS_001_8----------------------#'
###############################################################
# Check if accessing variable with SESSION,LOCAL and without #
# SCOPE points to same session variable #
###############################################################
SET @@default_tmp_storage_engine = MYISAM;
SELECT @@default_tmp_storage_engine = @@local.default_tmp_storage_engine;
SELECT @@local.default_tmp_storage_engine = @@session.default_tmp_storage_engine;
--echo '#---------------------FN_DYNVARS_001_9----------------------#'
#########################################################################
# Check if default_tmp_storage_engine can be accessed with and without @@ sign #
#########################################################################
SET default_tmp_storage_engine = MEMORY;
SELECT @@default_tmp_storage_engine;
--Error ER_UNKNOWN_TABLE
SELECT local.default_tmp_storage_engine;
--Error ER_UNKNOWN_TABLE
SELECT session.default_tmp_storage_engine;
--Error ER_BAD_FIELD_ERROR
SELECT default_tmp_storage_engine = @@session.default_tmp_storage_engine;
# check the old obsolete name
SET @@default_tmp_storage_engine = @start_global_value;
SET default_tmp_storage_engine = MyISAM;
SET default_storage_engine = MyISAM;
CREATE TABLE t1 (a INT);
CREATE TEMPORARY TABLE t2 (b INT);
SHOW CREATE TABLE t1;
SHOW CREATE TABLE t2;
DROP TABLE t1, t2;
SET default_storage_engine = MEMORY;
CREATE TABLE t1 (a INT);
CREATE TEMPORARY TABLE t2 (b INT);
SHOW CREATE TABLE t1;
SHOW CREATE TABLE t2;
DROP TABLE t1, t2;
# test default_tmp_storage_engine = NULL
SET @@global.default_tmp_storage_engine = NULL;
SET @@session.default_tmp_storage_engine = NULL;
SET default_storage_engine = MEMORY;
CREATE TABLE t1 (a INT);
CREATE TEMPORARY TABLE t2 (b INT);
SHOW CREATE TABLE t1;
SHOW CREATE TABLE t2;
DROP TABLE t1, t2;
SET default_storage_engine = MYISAM;
CREATE TABLE t1 (a INT);
CREATE TEMPORARY TABLE t2 (b INT);
SHOW CREATE TABLE t1;
SHOW CREATE TABLE t2;
DROP TABLE t1, t2;
SET default_tmp_storage_engine = DEFAULT;
SET default_storage_engine = DEFAULT;
CREATE TABLE t1 (a INT);
CREATE TEMPORARY TABLE t2 (b INT);
SHOW CREATE TABLE t1;
SHOW CREATE TABLE t2;
DROP TABLE t1, t2;
####################################
# Restore initial value #
####################################
SET @@global.default_tmp_storage_engine = @start_global_value;
SELECT @@global.default_tmp_storage_engine;
SET @@session.default_tmp_storage_engine = @start_session_value;
SELECT @@session.default_tmp_storage_engine;
#############################################################
# END OF default_tmp_storage_engine TESTS #
#############################################################