diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-20 16:53:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-20 16:53:20 +0300 |
| commit | 44fd2c4b24b35cdb5f573395fe07800d05b7c8b6 (patch) | |
| tree | 13c130d521c7c1dea3bc9b8b26d9057a1c268668 /mysql-test/main/create_or_replace.result | |
| parent | 5d9d379329abcbb661ed6c027efbb9fd763958c6 (diff) | |
| parent | 0792aff161132fb953510555fe45544991dec95d (diff) | |
| download | mariadb-git-44fd2c4b24b35cdb5f573395fe07800d05b7c8b6.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/main/create_or_replace.result')
| -rw-r--r-- | mysql-test/main/create_or_replace.result | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mysql-test/main/create_or_replace.result b/mysql-test/main/create_or_replace.result index 178b7182666..d4f145a14fa 100644 --- a/mysql-test/main/create_or_replace.result +++ b/mysql-test/main/create_or_replace.result @@ -33,13 +33,13 @@ Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TEMPORARY TABLE t1; 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 DROP TABLE t1; create temporary table t1 (i int) engine=InnoDB; create or replace temporary table t1 (a int, b int) engine=InnoDB; @@ -48,7 +48,7 @@ show create table t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( `j` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; CREATE OR REPLACE TABLE t1 (a int); LOCK TABLES t1 write; @@ -62,13 +62,13 @@ Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TEMPORARY TABLE t1; 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 CREATE OR REPLACE TABLE t2 (a int); ERROR HY000: Table 't2' was not locked with LOCK TABLES DROP TABLE t1; @@ -90,7 +90,7 @@ Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( `b` int(11) DEFAULT NULL, `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TEMPORARY TABLE t1 AS SELECT a FROM t2; CREATE TEMPORARY TABLE IF NOT EXISTS t1(a int, b int) SELECT 1,2 FROM t2; @@ -103,7 +103,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `1` int(1) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; create table t1 (a int); create or replace table t1 as select * from t1; @@ -123,7 +123,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a int) SELECT * from t2; SELECT * FROM t1; @@ -144,7 +144,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `1` int(1) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE OR REPLACE TABLE t1 (a int); LOCK TABLES t1 write,t2 write; @@ -220,7 +220,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `j` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (i int) engine=InnoDB; lock table t1 write, t2 write; @@ -371,7 +371,7 @@ 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 drop table t1; create table t1 (b int); lock tables t1 write, t2 read; @@ -386,7 +386,7 @@ 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 drop table t1; create or replace table t1 like t2; create or replace table t1 like t1; |