diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-13 16:36:38 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-13 16:36:38 +0300 |
| commit | 18795f55122b04cb5c9ea19498b720735b80714b (patch) | |
| tree | 1a749eeaaabaa86e9b755cef817a6267a6b59960 /mysql-test/main/view.result | |
| parent | 9a8faeea142ea6f575419799c9439f4673971573 (diff) | |
| parent | 68ce0231ad6a16e02db9d67a217a88055b6d01ff (diff) | |
| download | mariadb-git-18795f55122b04cb5c9ea19498b720735b80714b.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main/view.result')
| -rw-r--r-- | mysql-test/main/view.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/view.result b/mysql-test/main/view.result index 9cce0d0f626..a855614c5b2 100644 --- a/mysql-test/main/view.result +++ b/mysql-test/main/view.result @@ -6328,7 +6328,7 @@ t2 CREATE TABLE `t2` ( `code` int(11) DEFAULT NULL, `COUNT(DISTINCT country)` bigint(21) NOT NULL, `MAX(id)` int(11) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE t3 AS SELECT code, COUNT(DISTINCT country), MAX(id) FROM v1 GROUP BY code ORDER BY MAX(id); SHOW CREATE TABLE t3; @@ -6337,7 +6337,7 @@ t3 CREATE TABLE `t3` ( `code` int(11) DEFAULT NULL, `COUNT(DISTINCT country)` bigint(21) NOT NULL, `MAX(id)` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP VIEW v1; DROP TABLE t1,t2,t3; # |