diff options
| author | Alexander Barkov <bar@mariadb.com> | 2022-09-02 17:32:14 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2022-09-12 22:10:39 +0400 |
| commit | f1544424de2b8c9d1c3faefbbdd15543db7dfd12 (patch) | |
| tree | ebac7186e67915f333a5e9fec2e801ae45c8eccc /mysql-test/main/func_time.result | |
| parent | 667df98c3e0f32d391af4eb65c618043720b6a2f (diff) | |
| download | mariadb-git-f1544424de2b8c9d1c3faefbbdd15543db7dfd12.tar.gz | |
MDEV-29446 Change SHOW CREATE TABLE to display default collation
Diffstat (limited to 'mysql-test/main/func_time.result')
| -rw-r--r-- | mysql-test/main/func_time.result | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/main/func_time.result b/mysql-test/main/func_time.result index f42a06e7af0..c3b1bcd68b0 100644 --- a/mysql-test/main/func_time.result +++ b/mysql-test/main/func_time.result @@ -956,7 +956,7 @@ t1 CREATE TABLE `t1` ( `curtime() - curtime()` int(9) NOT NULL, `sec_to_time(1) + 0` int(9) DEFAULT NULL, `from_unixtime(1) + 0` bigint(16) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; SELECT SEC_TO_TIME(3300000); SEC_TO_TIME(3300000) @@ -2162,7 +2162,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `f2` varchar(22) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t2; f2 0.000000 @@ -2283,7 +2283,7 @@ t1 CREATE TABLE `t1` ( `c2` varchar(10) DEFAULT NULL, `c3` varchar(10) DEFAULT NULL, `c4` varchar(10) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # # MDEV-4870 Wrong values of CASE, COALESCE, IFNULL on a combination of different temporal types @@ -3245,7 +3245,7 @@ t2 CREATE TABLE `t2` ( `EXTRACT(HOUR_MICROSECOND FROM a)` bigint(13) DEFAULT NULL, `EXTRACT(MINUTE_MICROSECOND FROM a)` bigint(11) DEFAULT NULL, `EXTRACT(SECOND_MICROSECOND FROM a)` int(9) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1,t2; CREATE TABLE t1 (a TIME(6)); INSERT INTO t1 VALUES ('-838:59:59.999999'),('838:59:59.999999'); @@ -3426,7 +3426,7 @@ t2 CREATE TABLE `t2` ( `EXTRACT(HOUR_MICROSECOND FROM a)` bigint(13) DEFAULT NULL, `EXTRACT(MINUTE_MICROSECOND FROM a)` bigint(11) DEFAULT NULL, `EXTRACT(SECOND_MICROSECOND FROM a)` int(9) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1,t2; # # MDEV-14926 AddressSanitizer: heap-use-after-free in make_date_time on weird combination of functions @@ -3543,7 +3543,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` varchar(19) DEFAULT NULL, `c2` varchar(26) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1; c1 c2 2001-01-02 10:20:31 @@ -3609,7 +3609,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `TO_SECONDS('9999-12-31 23:59:59')` bigint(12) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SET sql_mode=DEFAULT; # @@ -3730,7 +3730,7 @@ t1 CREATE TABLE `t1` ( `c3` varchar(4) DEFAULT NULL, `c4` varchar(2) DEFAULT NULL, `c5` varchar(8) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; EXECUTE IMMEDIATE "CREATE TABLE t1 AS SELECT @@ -3750,7 +3750,7 @@ t1 CREATE TABLE `t1` ( `c3` varchar(4) DEFAULT NULL, `c4` varchar(2) DEFAULT NULL, `c5` varchar(100) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # # MDEV-16152 Expressions with INTERVAL return bad results in some cases |