diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 09:33:07 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 09:33:07 +0300 |
commit | 7c7ac6d4a4c77d4c302732da2efe6785b1f0e455 (patch) | |
tree | 652c6fd4576bab721661075f3ef1f3962251c8c9 /mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result | |
parent | b73c70c265cab9bae2fd5c243b484172bec0a91d (diff) | |
parent | 789f55c947a8aa224e5b0a71d5c0bea375320091 (diff) | |
download | mariadb-git-7c7ac6d4a4c77d4c302732da2efe6785b1f0e455.tar.gz |
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result')
-rw-r--r-- | mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result b/mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result index 22056efc934..3c218539472 100644 --- a/mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result +++ b/mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result @@ -105,12 +105,12 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW CREATE TABLE t2; Table Create Table t2 CREATE TEMPORARY TABLE `t2` ( `b` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1, t2; SET default_storage_engine = MEMORY; CREATE TABLE t1 (a INT); @@ -119,12 +119,12 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=latin1 +) ENGINE=MEMORY DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW CREATE TABLE t2; Table Create Table t2 CREATE TEMPORARY TABLE `t2` ( `b` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1, t2; SET @@global.default_tmp_storage_engine = NULL; SET @@session.default_tmp_storage_engine = NULL; @@ -135,12 +135,12 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=latin1 +) ENGINE=MEMORY DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW CREATE TABLE t2; Table Create Table t2 CREATE TEMPORARY TABLE `t2` ( `b` int(11) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=latin1 +) ENGINE=MEMORY DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1, t2; SET default_storage_engine = MYISAM; CREATE TABLE t1 (a INT); @@ -149,12 +149,12 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW CREATE TABLE t2; Table Create Table t2 CREATE TEMPORARY TABLE `t2` ( `b` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1, t2; SET default_tmp_storage_engine = DEFAULT; SET default_storage_engine = DEFAULT; @@ -164,12 +164,12 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW CREATE TABLE t2; Table Create Table t2 CREATE TEMPORARY TABLE `t2` ( `b` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1, t2; SET @@global.default_tmp_storage_engine = @start_global_value; SELECT @@global.default_tmp_storage_engine; |