3304 Georgi Kodinov 2011-07-25
Bug #12774208: DEFAULT_TEMP_STORAGE_ENGINE SHOULD BE NAMED
DEFAULT_TMP_STORAGE_ENGINE
Remaned the option to be more consistent with other existing options.
renamed:
mysql-test/suite/sys_vars/r/default_temp_storage_engine_basic.result => mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result
mysql-test/suite/sys_vars/t/default_temp_storage_engine_basic.test => mysql-test/suite/sys_vars/t/default_tmp_storage_engine_basic.test
modified:
cmake/create_initial_db.cmake.in
mysql-test/include/mix1.inc
mysql-test/lib/mtr_cases.pm
mysql-test/mysql-test-run.pl
mysql-test/r/mysqld--help-notwin.result
mysql-test/r/mysqld--help-win.result
mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt
mysql-test/suite/innodb/r/innodb_mysql.result
mysql-test/t/bootstrap-master.opt
mysql-test/t/bootstrap.test
mysql-test/t/ctype_utf8mb4-master.opt
sql/mysqld.cc
sql/mysqld.h
sql/sys_vars.cc
mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result
mysql-test/suite/sys_vars/t/default_tmp_storage_engine_basic.test
3303 Sunny Bains 2011-07-26
Add innodb_rollback_segments to the all_vars.result file. This variable doesn't
need a dedicated test of its own because it is an alias for innodb_undo_logs.
modified:
mysql-test/suite/sys_vars/r/all_vars.result
=== modified file 'cmake/create_initial_db.cmake.in'
--- a/cmake/create_initial_db.cmake.in 2011-07-25 09:26:08 +0000
+++ b/cmake/create_initial_db.cmake.in 2011-07-25 15:13:06 +0000
@@ -58,7 +58,7 @@ SET(BOOTSTRAP_COMMAND
--basedir=.
--datadir=.
--default-storage-engine=MyISAM
- --default-temp-storage-engine=MyISAM
+ --default-tmp-storage-engine=MyISAM
--loose-skip-innodb
--loose-skip-ndbcluster
--max_allowed_packet=8M
=== modified file 'mysql-test/include/mix1.inc'
--- a/mysql-test/include/mix1.inc 2011-07-08 12:30:52 +0000
+++ b/mysql-test/include/mix1.inc 2011-07-25 15:13:06 +0000
@@ -26,7 +26,7 @@
#
eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
-eval SET SESSION DEFAULT_TEMP_STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_TMP_STORAGE_ENGINE = $engine_type;
--disable_warnings
drop table if exists t1,t2,t3,t1m,t1i,t2m,t2i,t4;
=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm 2011-07-04 12:59:01 +0000
+++ b/mysql-test/lib/mtr_cases.pm 2011-07-25 15:13:06 +0000
@@ -616,12 +616,12 @@ sub optimize_cases {
foreach my $opt ( @{$tinfo->{master_opt}} ) {
my $default_engine=
mtr_match_prefix($opt, "--default-storage-engine=");
- my $default_temp_engine=
- mtr_match_prefix($opt, "--default-temp-storage-engine=");
+ my $default_tmp_engine=
+ mtr_match_prefix($opt, "--default-tmp-storage-engine=");
# Allow use of uppercase, convert to all lower case
$default_engine =~ tr/A-Z/a-z/;
- $default_temp_engine =~ tr/A-Z/a-z/;
+ $default_tmp_engine =~ tr/A-Z/a-z/;
if (defined $default_engine){
@@ -644,26 +644,26 @@ sub optimize_cases {
$tinfo->{'innodb_test'}= 1
if ( $default_engine =~ /^innodb/i );
}
- if (defined $default_temp_engine){
+ if (defined $default_tmp_engine){
#print " $tinfo->{name}\n";
- #print " - The test asked to use '$default_temp_engine' as temp engine\n";
+ #print " - The test asked to use '$default_tmp_engine' as temp engine\n";
- #my $engine_value= $::mysqld_variables{$default_temp_engine};
+ #my $engine_value= $::mysqld_variables{$default_tmp_engine};
#print " - The mysqld_variables says '$engine_value'\n";
- if ( ! exists $::mysqld_variables{$default_temp_engine} and
- ! exists $builtin_engines{$default_temp_engine} )
+ if ( ! exists $::mysqld_variables{$default_tmp_engine} and
+ ! exists $builtin_engines{$default_tmp_engine} )
{
$tinfo->{'skip'}= 1;
$tinfo->{'comment'}=
- "'$default_temp_engine' not supported";
+ "'$default_tmp_engine' not supported";
}
$tinfo->{'ndb_test'}= 1
- if ( $default_temp_engine =~ /^ndb/i );
+ if ( $default_tmp_engine =~ /^ndb/i );
$tinfo->{'innodb_test'}= 1
- if ( $default_temp_engine =~ /^innodb/i );
+ if ( $default_tmp_engine =~ /^innodb/i );
}
}
@@ -1014,8 +1014,8 @@ sub collect_one_test_case {
# the default storage engine is innodb.
push(@{$tinfo->{'master_opt'}}, "--default-storage-engine=MyISAM");
push(@{$tinfo->{'slave_opt'}}, "--default-storage-engine=MyISAM");
- push(@{$tinfo->{'master_opt'}}, "--default-temp-storage-engine=MyISAM");
- push(@{$tinfo->{'slave_opt'}}, "--default-temp-storage-engine=MyISAM");
+ push(@{$tinfo->{'master_opt'}}, "--default-tmp-storage-engine=MyISAM");
+ push(@{$tinfo->{'slave_opt'}}, "--default-tmp-storage-engine=MyISAM");
}
if ( $tinfo->{'need_binlog'} )
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl 2011-07-20 14:40:52 +0000
+++ b/mysql-test/mysql-test-run.pl 2011-07-25 15:13:06 +0000
@@ -1370,11 +1370,11 @@ sub command_line_setup {
collect_option('default-storage-engine', $1);
mtr_report("Using default engine '$1'")
}
- if ( $arg =~ /default-temp-storage-engine=(\S+)/ )
+ if ( $arg =~ /default-tmp-storage-engine=(\S+)/ )
{
# Save this for collect phase
- collect_option('default-temp-storage-engine', $1);
- mtr_report("Using default temp engine '$1'")
+ collect_option('default-tmp-storage-engine', $1);
+ mtr_report("Using default tmp engine '$1'")
}
}
=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result 2011-07-22 07:56:14 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result 2011-07-25 15:13:06 +0000
@@ -123,11 +123,11 @@ The following options may be given as th
The DATETIME format (ignored)
--default-storage-engine=name
The default storage engine for new tables
- --default-temp-storage-engine=name
- The default storage engine for new explict temporary
- tables
--default-time-zone=name
Set the default time zone.
+ --default-tmp-storage-engine=name
+ The default storage engine for new explict temporary
+ tables
--default-week-format=#
The default week format used by WEEK() functions
--delay-key-write[=name]
@@ -810,8 +810,8 @@ console FALSE
date-format %Y-%m-%d
datetime-format %Y-%m-%d %H:%i:%s
default-storage-engine InnoDB
-default-temp-storage-engine InnoDB
default-time-zone (No default value)
+default-tmp-storage-engine InnoDB
default-week-format 0
delay-key-write ON
delayed-insert-limit 100
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result 2011-07-22 07:56:14 +0000
+++ b/mysql-test/r/mysqld--help-win.result 2011-07-25 15:13:06 +0000
@@ -123,11 +123,11 @@ The following options may be given as th
The DATETIME format (ignored)
--default-storage-engine=name
The default storage engine for new tables
- --default-temp-storage-engine=name
- The default storage engine for new explict temporary
- tables
--default-time-zone=name
Set the default time zone.
+ --default-tmp-storage-engine=name
+ The default storage engine for new explict temporary
+ tables
--default-week-format=#
The default week format used by WEEK() functions
--delay-key-write[=name]
@@ -814,8 +814,8 @@ console FALSE
date-format %Y-%m-%d
datetime-format %Y-%m-%d %H:%i:%s
default-storage-engine InnoDB
-default-temp-storage-engine InnoDB
default-time-zone (No default value)
+default-tmp-storage-engine InnoDB
default-week-format 0
delay-key-write ON
delayed-insert-limit 100
=== modified file 'mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt'
--- a/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt 2011-06-21 10:05:48 +0000
+++ b/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt 2011-07-25 15:13:06 +0000
@@ -1 +1 @@
---innodb_lock_wait_timeout=2 --default-storage-engine=MyISAM --default-temp-storage-engine=MyISAM
+--innodb_lock_wait_timeout=2 --default-storage-engine=MyISAM --default-tmp-storage-engine=MyISAM
=== modified file 'mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt'
--- a/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt 2011-06-21 10:05:48 +0000
+++ b/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt 2011-07-25 15:13:06 +0000
@@ -1 +1 @@
---innodb_lock_wait_timeout=2 --binlog-direct-non-transactional-updates=FALSE --default-storage-engine=MyISAM --default-temp-storage-engine=MyISAM
+--innodb_lock_wait_timeout=2 --binlog-direct-non-transactional-updates=FALSE --default-storage-engine=MyISAM --default-tmp-storage-engine=MyISAM
=== modified file 'mysql-test/suite/innodb/r/innodb_mysql.result'
--- a/mysql-test/suite/innodb/r/innodb_mysql.result 2011-07-20 14:40:52 +0000
+++ b/mysql-test/suite/innodb/r/innodb_mysql.result 2011-07-25 15:13:06 +0000
@@ -1,7 +1,7 @@
set global innodb_support_xa=default;
set session innodb_support_xa=default;
SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
-SET SESSION DEFAULT_TEMP_STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_TMP_STORAGE_ENGINE = InnoDB;
drop table if exists t1,t2,t3,t1m,t1i,t2m,t2i,t4;
drop procedure if exists p1;
create table t1 (
=== renamed file 'mysql-test/suite/sys_vars/r/default_temp_storage_engine_basic.result' => 'mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result'
--- a/mysql-test/suite/sys_vars/r/default_temp_storage_engine_basic.result 2011-06-21 10:05:48 +0000
+++ b/mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result 2011-07-25 15:13:06 +0000
@@ -1,113 +1,113 @@
-SET @start_global_value = @@global.default_temp_storage_engine;
+SET @start_global_value = @@global.default_tmp_storage_engine;
SELECT @start_global_value;
@start_global_value
InnoDB
-SET @start_session_value = @@session.default_temp_storage_engine;
+SET @start_session_value = @@session.default_tmp_storage_engine;
SELECT @start_session_value;
@start_session_value
InnoDB
'#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.default_temp_storage_engine = INNODB;
-SET @@global.default_temp_storage_engine = DEFAULT;
-SELECT @@global.default_temp_storage_engine;
-@@global.default_temp_storage_engine
-InnoDB
-SET @@session.default_temp_storage_engine = INNODB;
-SET @@session.default_temp_storage_engine = DEFAULT;
-SELECT @@session.default_temp_storage_engine;
-@@session.default_temp_storage_engine
+SET @@global.default_tmp_storage_engine = INNODB;
+SET @@global.default_tmp_storage_engine = DEFAULT;
+SELECT @@global.default_tmp_storage_engine;
+@@global.default_tmp_storage_engine
+InnoDB
+SET @@session.default_tmp_storage_engine = INNODB;
+SET @@session.default_tmp_storage_engine = DEFAULT;
+SELECT @@session.default_tmp_storage_engine;
+@@session.default_tmp_storage_engine
InnoDB
'#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.default_temp_storage_engine = MYISAM;
-SELECT @@global.default_temp_storage_engine;
-@@global.default_temp_storage_engine
+SET @@global.default_tmp_storage_engine = MYISAM;
+SELECT @@global.default_tmp_storage_engine;
+@@global.default_tmp_storage_engine
MyISAM
-SET @@global.default_temp_storage_engine = MERGE;
-SELECT @@global.default_temp_storage_engine;
-@@global.default_temp_storage_engine
+SET @@global.default_tmp_storage_engine = MERGE;
+SELECT @@global.default_tmp_storage_engine;
+@@global.default_tmp_storage_engine
MRG_MYISAM
-SET @@global.default_temp_storage_engine = MEMORY;
-SELECT @@global.default_temp_storage_engine;
-@@global.default_temp_storage_engine
+SET @@global.default_tmp_storage_engine = MEMORY;
+SELECT @@global.default_tmp_storage_engine;
+@@global.default_tmp_storage_engine
MEMORY
-SET @@global.default_temp_storage_engine = INNODB;
-SELECT @@global.default_temp_storage_engine;
-@@global.default_temp_storage_engine
+SET @@global.default_tmp_storage_engine = INNODB;
+SELECT @@global.default_tmp_storage_engine;
+@@global.default_tmp_storage_engine
InnoDB
'#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@session.default_temp_storage_engine = MYISAM;
-SELECT @@session.default_temp_storage_engine;
-@@session.default_temp_storage_engine
+SET @@session.default_tmp_storage_engine = MYISAM;
+SELECT @@session.default_tmp_storage_engine;
+@@session.default_tmp_storage_engine
MyISAM
-SET @@session.default_temp_storage_engine = MERGE;
-SELECT @@session.default_temp_storage_engine;
-@@session.default_temp_storage_engine
+SET @@session.default_tmp_storage_engine = MERGE;
+SELECT @@session.default_tmp_storage_engine;
+@@session.default_tmp_storage_engine
MRG_MYISAM
-SET @@session.default_temp_storage_engine = MEMORY;
-SELECT @@session.default_temp_storage_engine;
-@@session.default_temp_storage_engine
+SET @@session.default_tmp_storage_engine = MEMORY;
+SELECT @@session.default_tmp_storage_engine;
+@@session.default_tmp_storage_engine
MEMORY
-SET @@session.default_temp_storage_engine = INNODB;
-SELECT @@session.default_temp_storage_engine;
-@@session.default_temp_storage_engine
+SET @@session.default_tmp_storage_engine = INNODB;
+SELECT @@session.default_tmp_storage_engine;
+@@session.default_tmp_storage_engine
InnoDB
'#------------------FN_DYNVARS_005_04-----------------------#'
-SET @@global.default_temp_storage_engine = 8199;
-ERROR 42000: Incorrect argument type to variable 'default_temp_storage_engine'
-SET @@global.default_temp_storage_engine = NULL;
-ERROR 42000: Variable 'default_temp_storage_engine' can't be set to the value of 'NULL'
-SET @@global.default_temp_storage_engine = -1024;
-ERROR 42000: Incorrect argument type to variable 'default_temp_storage_engine'
-SET @@global.default_temp_storage_engine = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'default_temp_storage_engine'
-SET @@global.default_temp_storage_engine = FILE;
+SET @@global.default_tmp_storage_engine = 8199;
+ERROR 42000: Incorrect argument type to variable 'default_tmp_storage_engine'
+SET @@global.default_tmp_storage_engine = NULL;
+ERROR 42000: Variable 'default_tmp_storage_engine' can't be set to the value of 'NULL'
+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_temp_storage_engine = 8199;
-ERROR 42000: Incorrect argument type to variable 'default_temp_storage_engine'
-SET @@session.default_temp_storage_engine = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'default_temp_storage_engine'
-SET @@session.default_temp_storage_engine = RECORD;
+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_temp_storage_engine =
+SELECT @@global.default_tmp_storage_engine =
VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='default_temp_storage_engine';
-@@global.default_temp_storage_engine =
+WHERE VARIABLE_NAME='default_tmp_storage_engine';
+@@global.default_tmp_storage_engine =
VARIABLE_VALUE
1
'#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@session.default_temp_storage_engine =
+SELECT @@session.default_tmp_storage_engine =
VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='default_temp_storage_engine';
-@@session.default_temp_storage_engine =
+WHERE VARIABLE_NAME='default_tmp_storage_engine';
+@@session.default_tmp_storage_engine =
VARIABLE_VALUE
1
'#------------------FN_DYNVARS_005_07-----------------------#'
-SET @@global.default_temp_storage_engine = TRUE;
-ERROR 42000: Incorrect argument type to variable 'default_temp_storage_engine'
-SET @@global.default_temp_storage_engine = FALSE;
-ERROR 42000: Incorrect argument type to variable 'default_temp_storage_engine'
+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_temp_storage_engine = MYISAM;
-SELECT @@default_temp_storage_engine = @@local.default_temp_storage_engine;
-@@default_temp_storage_engine = @@local.default_temp_storage_engine
+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_temp_storage_engine = @@session.default_temp_storage_engine;
-@@local.default_temp_storage_engine = @@session.default_temp_storage_engine
+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_temp_storage_engine = MEMORY;
-SELECT @@default_temp_storage_engine;
-@@default_temp_storage_engine
+SET default_tmp_storage_engine = MEMORY;
+SELECT @@default_tmp_storage_engine;
+@@default_tmp_storage_engine
MEMORY
-SELECT local.default_temp_storage_engine;
+SELECT local.default_tmp_storage_engine;
ERROR 42S02: Unknown table 'local' in field list
-SELECT session.default_temp_storage_engine;
+SELECT session.default_tmp_storage_engine;
ERROR 42S02: Unknown table 'session' in field list
-SELECT default_temp_storage_engine = @@session.default_temp_storage_engine;
-ERROR 42S22: Unknown column 'default_temp_storage_engine' in 'field list'
-SET @@default_temp_storage_engine = @start_global_value;
-SET default_temp_storage_engine = MyISAM;
+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);
@@ -122,7 +122,7 @@ t2 CREATE TEMPORARY TABLE `t2` (
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1, t2;
-SET default_temp_storage_engine = InnoDB;
+SET default_tmp_storage_engine = InnoDB;
CREATE TABLE t1 (a INT);
CREATE TEMPORARY TABLE t2 (b INT);
SHOW CREATE TABLE t1;
@@ -150,7 +150,7 @@ t2 CREATE TEMPORARY TABLE `t2` (
`b` int(11) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
DROP TABLE t1, t2;
-SET default_temp_storage_engine = DEFAULT;
+SET default_tmp_storage_engine = DEFAULT;
SET default_storage_engine = DEFAULT;
CREATE TABLE t1 (a INT);
CREATE TEMPORARY TABLE t2 (b INT);
@@ -165,11 +165,11 @@ t2 CREATE TEMPORARY TABLE `t2` (
`b` int(11) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
DROP TABLE t1, t2;
-SET @@global.default_temp_storage_engine = @start_global_value;
-SELECT @@global.default_temp_storage_engine;
-@@global.default_temp_storage_engine
-InnoDB
-SET @@session.default_temp_storage_engine = @start_session_value;
-SELECT @@session.default_temp_storage_engine;
-@@session.default_temp_storage_engine
+SET @@global.default_tmp_storage_engine = @start_global_value;
+SELECT @@global.default_tmp_storage_engine;
+@@global.default_tmp_storage_engine
+InnoDB
+SET @@session.default_tmp_storage_engine = @start_session_value;
+SELECT @@session.default_tmp_storage_engine;
+@@session.default_tmp_storage_engine
InnoDB
=== renamed file 'mysql-test/suite/sys_vars/t/default_temp_storage_engine_basic.test' => 'mysql-test/suite/sys_vars/t/default_tmp_storage_engine_basic.test'
--- a/mysql-test/suite/sys_vars/t/default_temp_storage_engine_basic.test 2011-06-21 10:05:48 +0000
+++ b/mysql-test/suite/sys_vars/t/default_tmp_storage_engine_basic.test 2011-07-25 15:13:06 +0000
@@ -3,7 +3,7 @@
--source include/load_sysvars.inc
######################################################################
-# START OF default_temp_storage_engine TESTS #
+# START OF default_tmp_storage_engine TESTS #
######################################################################
@@ -11,84 +11,84 @@
# Save initial value #
#############################################################
-SET @start_global_value = @@global.default_temp_storage_engine;
+SET @start_global_value = @@global.default_tmp_storage_engine;
SELECT @start_global_value;
-SET @start_session_value = @@session.default_temp_storage_engine;
+SET @start_session_value = @@session.default_tmp_storage_engine;
SELECT @start_session_value;
--echo '#--------------------FN_DYNVARS_005_01-------------------------#'
######################################################################
-# Display the DEFAULT value of default_temp_storage_engine #
+# Display the DEFAULT value of default_tmp_storage_engine #
######################################################################
-SET @@global.default_temp_storage_engine = INNODB;
-SET @@global.default_temp_storage_engine = DEFAULT;
-SELECT @@global.default_temp_storage_engine;
-
-SET @@session.default_temp_storage_engine = INNODB;
-SET @@session.default_temp_storage_engine = DEFAULT;
-SELECT @@session.default_temp_storage_engine;
+SET @@global.default_tmp_storage_engine = INNODB;
+SET @@global.default_tmp_storage_engine = DEFAULT;
+SELECT @@global.default_tmp_storage_engine;
+
+SET @@session.default_tmp_storage_engine = INNODB;
+SET @@session.default_tmp_storage_engine = DEFAULT;
+SELECT @@session.default_tmp_storage_engine;
--echo '#--------------------FN_DYNVARS_005_02-------------------------#'
########################################################################
-# Change the value of default_temp_storage_engine to a valid value for GLOBAL Scope #
+# Change the value of default_tmp_storage_engine to a valid value for GLOBAL Scope #
########################################################################
-SET @@global.default_temp_storage_engine = MYISAM;
-SELECT @@global.default_temp_storage_engine;
-SET @@global.default_temp_storage_engine = MERGE;
-SELECT @@global.default_temp_storage_engine;
-SET @@global.default_temp_storage_engine = MEMORY;
-SELECT @@global.default_temp_storage_engine;
-SET @@global.default_temp_storage_engine = INNODB;
-SELECT @@global.default_temp_storage_engine;
+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;
+SET @@global.default_tmp_storage_engine = INNODB;
+SELECT @@global.default_tmp_storage_engine;
--echo '#--------------------FN_DYNVARS_005_03-------------------------#'
#########################################################################
-# Change the value of default_temp_storage_engine to a valid value for SESSION Scope #
+# Change the value of default_tmp_storage_engine to a valid value for SESSION Scope #
#########################################################################
-SET @@session.default_temp_storage_engine = MYISAM;
-SELECT @@session.default_temp_storage_engine;
-SET @@session.default_temp_storage_engine = MERGE;
-SELECT @@session.default_temp_storage_engine;
-SET @@session.default_temp_storage_engine = MEMORY;
-SELECT @@session.default_temp_storage_engine;
-SET @@session.default_temp_storage_engine = INNODB;
-SELECT @@session.default_temp_storage_engine;
+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;
+SET @@session.default_tmp_storage_engine = INNODB;
+SELECT @@session.default_tmp_storage_engine;
--echo '#------------------FN_DYNVARS_005_04-----------------------#'
##################################################################
-# Change the value of default_temp_storage_engine to an invalid value #
+# Change the value of default_tmp_storage_engine to an invalid value #
##################################################################
--Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.default_temp_storage_engine = 8199;
+SET @@global.default_tmp_storage_engine = 8199;
--Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.default_temp_storage_engine = NULL;
+SET @@global.default_tmp_storage_engine = NULL;
--Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.default_temp_storage_engine = -1024;
+SET @@global.default_tmp_storage_engine = -1024;
--Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.default_temp_storage_engine = 65530.34;
+SET @@global.default_tmp_storage_engine = 65530.34;
--Error ER_UNKNOWN_STORAGE_ENGINE
-SET @@global.default_temp_storage_engine = FILE;
+SET @@global.default_tmp_storage_engine = FILE;
--Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.default_temp_storage_engine = 8199;
+SET @@session.default_tmp_storage_engine = 8199;
--Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.default_temp_storage_engine = 65530.34;
+SET @@session.default_tmp_storage_engine = 65530.34;
--Error ER_UNKNOWN_STORAGE_ENGINE
-SET @@session.default_temp_storage_engine = RECORD;
+SET @@session.default_tmp_storage_engine = RECORD;
--echo '#------------------FN_DYNVARS_005_05-----------------------#'
@@ -97,18 +97,18 @@ SET @@session.default_temp_storage_engin
####################################################################
-SELECT @@global.default_temp_storage_engine =
+SELECT @@global.default_tmp_storage_engine =
VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
- WHERE VARIABLE_NAME='default_temp_storage_engine';
+ 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_temp_storage_engine =
+SELECT @@session.default_tmp_storage_engine =
VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES
- WHERE VARIABLE_NAME='default_temp_storage_engine';
+ WHERE VARIABLE_NAME='default_tmp_storage_engine';
--echo '#------------------FN_DYNVARS_005_07-----------------------#'
@@ -117,10 +117,10 @@ SELECT @@session.default_temp_storage_en
####################################################################
--Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.default_temp_storage_engine = TRUE;
+SET @@global.default_tmp_storage_engine = TRUE;
--Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.default_temp_storage_engine = FALSE;
+SET @@global.default_tmp_storage_engine = FALSE;
--echo '#---------------------FN_DYNVARS_001_8----------------------#'
@@ -129,29 +129,29 @@ SET @@global.default_temp_storage_engine
# SCOPE points to same session variable #
###############################################################
-SET @@default_temp_storage_engine = MYISAM;
-SELECT @@default_temp_storage_engine = @@local.default_temp_storage_engine;
-SELECT @@local.default_temp_storage_engine = @@session.default_temp_storage_engine;
+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_temp_storage_engine can be accessed with and without @@ sign #
+# Check if default_tmp_storage_engine can be accessed with and without @@ sign #
#########################################################################
-SET default_temp_storage_engine = MEMORY;
-SELECT @@default_temp_storage_engine;
+SET default_tmp_storage_engine = MEMORY;
+SELECT @@default_tmp_storage_engine;
--Error ER_UNKNOWN_TABLE
-SELECT local.default_temp_storage_engine;
+SELECT local.default_tmp_storage_engine;
--Error ER_UNKNOWN_TABLE
-SELECT session.default_temp_storage_engine;
+SELECT session.default_tmp_storage_engine;
--Error ER_BAD_FIELD_ERROR
-SELECT default_temp_storage_engine = @@session.default_temp_storage_engine;
+SELECT default_tmp_storage_engine = @@session.default_tmp_storage_engine;
# check the old obsolete name
-SET @@default_temp_storage_engine = @start_global_value;
+SET @@default_tmp_storage_engine = @start_global_value;
-SET default_temp_storage_engine = MyISAM;
+SET default_tmp_storage_engine = MyISAM;
SET default_storage_engine = MyISAM;
CREATE TABLE t1 (a INT);
CREATE TEMPORARY TABLE t2 (b INT);
@@ -159,7 +159,7 @@ SHOW CREATE TABLE t1;
SHOW CREATE TABLE t2;
DROP TABLE t1, t2;
-SET default_temp_storage_engine = InnoDB;
+SET default_tmp_storage_engine = InnoDB;
CREATE TABLE t1 (a INT);
CREATE TEMPORARY TABLE t2 (b INT);
SHOW CREATE TABLE t1;
@@ -173,7 +173,7 @@ SHOW CREATE TABLE t1;
SHOW CREATE TABLE t2;
DROP TABLE t1, t2;
-SET default_temp_storage_engine = DEFAULT;
+SET default_tmp_storage_engine = DEFAULT;
SET default_storage_engine = DEFAULT;
CREATE TABLE t1 (a INT);
CREATE TEMPORARY TABLE t2 (b INT);
@@ -185,13 +185,13 @@ DROP TABLE t1, t2;
# Restore initial value #
####################################
-SET @@global.default_temp_storage_engine = @start_global_value;
-SELECT @@global.default_temp_storage_engine;
-SET @@session.default_temp_storage_engine = @start_session_value;
-SELECT @@session.default_temp_storage_engine;
+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_temp_storage_engine TESTS #
+# END OF default_tmp_storage_engine TESTS #
#############################################################
=== modified file 'mysql-test/t/bootstrap-master.opt'
--- a/mysql-test/t/bootstrap-master.opt 2011-06-21 10:05:48 +0000
+++ b/mysql-test/t/bootstrap-master.opt 2011-07-25 15:13:06 +0000
@@ -1,3 +1,3 @@
--default-storage-engine=MyISAM
---default-temp-storage-engine=MyISAM
+--default-tmp-storage-engine=MyISAM
--skip-innodb
=== modified file 'mysql-test/t/bootstrap.test'
--- a/mysql-test/t/bootstrap.test 2011-06-21 10:05:48 +0000
+++ b/mysql-test/t/bootstrap.test 2011-07-25 15:13:06 +0000
@@ -8,7 +8,7 @@ drop table if exists t1;
# Add the datadir to the bootstrap command
let $MYSQLD_DATADIR= `select @@datadir`;
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --default-storage-engine=MyISAM --default-temp-storage-engine=MyISAM --skip-innodb;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --default-storage-engine=MyISAM --default-tmp-storage-engine=MyISAM --skip-innodb;
#
# Check that --bootstrap reads from stdin
#
=== modified file 'mysql-test/t/ctype_utf8mb4-master.opt'
--- a/mysql-test/t/ctype_utf8mb4-master.opt 2011-06-21 10:05:48 +0000
+++ b/mysql-test/t/ctype_utf8mb4-master.opt 2011-07-25 15:13:06 +0000
@@ -1,2 +1,2 @@
--default-storage-engine=MyISAM
---default-temp-storage-engine=MyISAM
+--default-tmp-storage-engine=MyISAM
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc 2011-07-22 08:10:35 +0000
+++ b/sql/mysqld.cc 2011-07-25 15:13:06 +0000
@@ -339,7 +339,7 @@ static char *lc_time_names_name;
char *my_bind_addr_str;
static char *default_collation_name;
char *default_storage_engine;
-char *default_temp_storage_engine;
+char *default_tmp_storage_engine;
static char compiled_default_collation_name[]= MYSQL_DEFAULT_COLLATION_NAME;
static I_List<THD> thread_cache;
static bool binlog_format_used= false;
@@ -3343,7 +3343,7 @@ int init_common_variables()
#else
default_storage_engine= const_cast<char *>("InnoDB");
#endif
- default_temp_storage_engine= default_storage_engine;
+ default_tmp_storage_engine= default_storage_engine;
/*
Add server status variables to the dynamic list of
@@ -4402,7 +4402,7 @@ a file name for --log-bin-index option",
if (initialize_storage_engine(default_storage_engine, "",
&global_system_variables.table_plugin))
unireg_abort(1);
- if (initialize_storage_engine(default_temp_storage_engine, " temp",
+ if (initialize_storage_engine(default_tmp_storage_engine, " temp",
&global_system_variables.temp_table_plugin))
unireg_abort(1);
@@ -6168,9 +6168,9 @@ struct my_option my_long_options[]=
{"default-storage-engine", 0, "The default storage engine for new tables",
&default_storage_engine, 0, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0 },
- {"default-temp-storage-engine", 0,
+ {"default-tmp-storage-engine", 0,
"The default storage engine for new explict temporary tables",
- &default_temp_storage_engine, 0, 0, GET_STR, REQUIRED_ARG,
+ &default_tmp_storage_engine, 0, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0 },
{"default-time-zone", 0, "Set the default time zone.",
&default_tz_name, &default_tz_name,
=== modified file 'sql/mysqld.h'
--- a/sql/mysqld.h 2011-07-21 16:27:14 +0000
+++ b/sql/mysqld.h 2011-07-25 15:13:06 +0000
@@ -129,7 +129,7 @@ extern my_bool opt_enable_shared_memory;
extern char *default_tz_name;
extern Time_zone *default_tz;
extern char *default_storage_engine;
-extern char *default_temp_storage_engine;
+extern char *default_tmp_storage_engine;
extern bool opt_endinfo, using_udf_functions;
extern my_bool locked_in_memory;
extern bool opt_using_transactions;
=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc 2011-07-19 15:11:15 +0000
+++ b/sql/sys_vars.cc 2011-07-25 15:13:06 +0000
@@ -2500,10 +2500,10 @@ static Sys_var_plugin Sys_default_storag
MYSQL_STORAGE_ENGINE_PLUGIN, DEFAULT(&default_storage_engine),
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_not_null));
-static Sys_var_plugin Sys_default_temp_storage_engine(
- "default_temp_storage_engine", "The default storage engine for new explict temporary tables",
+static Sys_var_plugin Sys_default_tmp_storage_engine(
+ "default_tmp_storage_engine", "The default storage engine for new explict temporary tables",
SESSION_VAR(temp_table_plugin), NO_CMD_LINE,
- MYSQL_STORAGE_ENGINE_PLUGIN, DEFAULT(&default_temp_storage_engine),
+ MYSQL_STORAGE_ENGINE_PLUGIN, DEFAULT(&default_tmp_storage_engine),
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_not_null));
// Alias for @@default_storage_engine
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (Georgi.Kodinov:3303 to 3304) Bug#12774208 | Georgi Kodinov | 26 Jul |
