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/main/metadata.result | |
| parent | b73c70c265cab9bae2fd5c243b484172bec0a91d (diff) | |
| parent | 789f55c947a8aa224e5b0a71d5c0bea375320091 (diff) | |
| download | mariadb-git-7c7ac6d4a4c77d4c302732da2efe6785b1f0e455.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/main/metadata.result')
| -rw-r--r-- | mysql-test/main/metadata.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/metadata.result b/mysql-test/main/metadata.result index 1d229643ade..5786e2fd461 100644 --- a/mysql-test/main/metadata.result +++ b/mysql-test/main/metadata.result @@ -786,7 +786,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `@a` longtext DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SELECT @b1:=10, @b2:=@b2:=111111111111; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr @@ -800,5 +800,5 @@ Table Create Table t1 CREATE TABLE `t1` ( `@b1:=10` int(2) NOT NULL, `@b2:=111111111111` bigint(12) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; |