diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-09-11 21:31:03 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-09-11 21:31:03 +0300 |
| commit | 1bf3e8ab43e982953d7534db902020d321364afb (patch) | |
| tree | 7de4aaac9f947d4302cd4edbb5677da8917ade71 /mysql-test/main/func_time.result | |
| parent | f5bebaf1d6a0ff2fca9b342ed5910b9d34a276bb (diff) | |
| parent | 4901f31c13f91e130f077f2f77b32c40b0036e32 (diff) | |
| download | mariadb-git-1bf3e8ab43e982953d7534db902020d321364afb.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main/func_time.result')
| -rw-r--r-- | mysql-test/main/func_time.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/main/func_time.result b/mysql-test/main/func_time.result index b6f9ca8e628..840db182fe7 100644 --- a/mysql-test/main/func_time.result +++ b/mysql-test/main/func_time.result @@ -2805,6 +2805,11 @@ SEC_TO_TIME(MAKEDATE(0,RAND(~0))) 838:59:59 Warnings: Warning 1292 Truncated incorrect seconds value: '20000101' +SELECT PERIOD_DIFF(2018, AES_ENCRYPT('Rae Bareli', 'Rae Bareli')); +PERIOD_DIFF(2018, AES_ENCRYPT('Rae Bareli', 'Rae Bareli')) +24257 +Warnings: +Warning 1292 Truncated incorrect INTEGER value: '-3S\xFA\xDE?\x00\x00\xCA\xB3\xEEE\xA4\xD1\xC1\xA8' # # End of 5.5 tests # @@ -3578,6 +3583,7 @@ DROP TABLE t1; # # MDEV-15363 Wrong result for CAST(LAST_DAY(TIME'00:00:00') AS TIME) # +set timestamp=unix_timestamp('2018-08-02 10:10:10'); SELECT LAST_DAY(TIME'00:00:00') AS c1, CAST(CAST(LAST_DAY(TIME'00:00:00') AS DATE) AS TIME) AS c2, |