database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.8 into 10.9

Browse Source
This commit is contained in:
Marko Mäkelä
2022-09-21 10:07:09 +03:00
parent 4a7367d528 4345d93100
commit a8e4540476
1218 changed files with 31234 additions and 30413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/main/func_time_hires.result
View File

@ -49,7 +49,7 @@ t1 CREATE TABLE `t1` (
`localtimestamp(6)` datetime(6) NOT NULL,
`time_to_sec(123456)` bigint(17) DEFAULT NULL,
`time_to_sec('12:34:56.789')` decimal(19,3) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select * from t1;
sec_to_time(12345) 03:25:45
sec_to_time(12345.6789) 03:25:45.6789
@ -133,7 +133,7 @@ t1 CREATE TABLE `t1` (
`t4` time(4) DEFAULT NULL,
`t5` time(5) DEFAULT NULL,
`t6` time(6) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select * from t1;
dauto 2011-01-02 12:13:14
d0 2011-01-02 12:13:14