diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 11:25:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 11:25:57 +0300 |
| commit | 49cee4e21a8e3cc0eccff3a6f9e493247344e24f (patch) | |
| tree | 24a47ceca33f9fa662fd1810aaedae69e8895867 /mysql-test/main/create_or_replace2.result | |
| parent | 6ebdd3013a18b01dbecec76b870810329eb76586 (diff) | |
| parent | 5e996fbad9e2326a197731c594c11ade8a3c2492 (diff) | |
| download | mariadb-git-49cee4e21a8e3cc0eccff3a6f9e493247344e24f.tar.gz | |
Merge 10.10 into 10.11
Diffstat (limited to 'mysql-test/main/create_or_replace2.result')
| -rw-r--r-- | mysql-test/main/create_or_replace2.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/main/create_or_replace2.result b/mysql-test/main/create_or_replace2.result index dd183441e42..248d5dbc3f5 100644 --- a/mysql-test/main/create_or_replace2.result +++ b/mysql-test/main/create_or_replace2.result @@ -16,7 +16,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL, KEY `a` (`a`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci connection slave; SHOW TABLES; Tables_in_test @@ -27,7 +27,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL, KEY `a` (`a`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci connection master; drop temporary table if exists tmp; drop table t1; @@ -49,7 +49,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, PRIMARY KEY (`a`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci show create table t2; Table Create Table t2 CREATE TABLE `t2` ( @@ -57,7 +57,7 @@ t2 CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL, KEY `t1_a` (`a`), CONSTRAINT `t1_a` FOREIGN KEY (`a`) REFERENCES `t1` (`a`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select * from t2; c a 2 2 |