diff options
| author | Alexander Barkov <bar@mariadb.com> | 2022-09-14 15:00:09 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2022-09-14 16:24:51 +0400 |
| commit | fe844c16b6cbd67386d1b9fc1cb9e5a656bbb885 (patch) | |
| tree | 0bd937aed2faa10b09c0b47884dad4a8e1d5d57c /mysql-test/main/type_date.result | |
| parent | fb70bb44d096f4117e9454740aa4fa0651a1a69e (diff) | |
| parent | 289105e282fb5f7865bb7ddb6226149ac5bdf2b8 (diff) | |
| download | mariadb-git-fe844c16b6cbd67386d1b9fc1cb9e5a656bbb885.tar.gz | |
Merge remote-tracking branch 'origin/10.4' into 10.5
Diffstat (limited to 'mysql-test/main/type_date.result')
| -rw-r--r-- | mysql-test/main/type_date.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/main/type_date.result b/mysql-test/main/type_date.result index ae3a51c96da..abd777f3520 100644 --- a/mysql-test/main/type_date.result +++ b/mysql-test/main/type_date.result @@ -885,7 +885,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `c1` date DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP VIEW v1; DROP TABLE t1; @@ -1112,7 +1112,7 @@ t2 CREATE TABLE `t2` ( `CEIL(a)` int(8) unsigned DEFAULT NULL, `ROUND(a)` int(8) unsigned DEFAULT NULL, `TRUNCATE(a,0)` int(8) unsigned DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2,t1; # # MDEV-23388 Assertion `args[0]->decimals == 0' failed in Item_func_round::fix_arg_int @@ -1141,7 +1141,7 @@ t2 CREATE TABLE `t2` ( `GREATEST(c_date,c_date)` date NOT NULL, `GREATEST(c_date,c_int)` date DEFAULT NULL, `GREATEST(c_int,c_date)` date DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; # |