diff options
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/type_date.result | 11 | ||||
| -rw-r--r-- | mysql-test/r/type_datetime.result | 8 | ||||
| -rw-r--r-- | mysql-test/r/type_time.result | 11 |
3 files changed, 30 insertions, 0 deletions
diff --git a/mysql-test/r/type_date.result b/mysql-test/r/type_date.result index 8f9e692d3e0..ca87f430c5d 100644 --- a/mysql-test/r/type_date.result +++ b/mysql-test/r/type_date.result @@ -298,3 +298,14 @@ insert t1 values ('2010-10-10 15:foobar'); Warnings: Warning 1265 Data truncated for column 'f1' at row 1 drop table t1; +# +# MDEV-4634 Crash in CONVERT_TZ +# +SELECT CONVERT_TZ(GREATEST(DATE('2021-00-00'),DATE('2022-00-00')),'+00:00','+7:5'); +CONVERT_TZ(GREATEST(DATE('2021-00-00'),DATE('2022-00-00')),'+00:00','+7:5') +NULL +Warnings: +Warning 1292 Incorrect datetime value: '2022-00-00 00:00:00' +# +# End of 5.3 tests +# diff --git a/mysql-test/r/type_datetime.result b/mysql-test/r/type_datetime.result index e32ee96cc82..b835eacac95 100644 --- a/mysql-test/r/type_datetime.result +++ b/mysql-test/r/type_datetime.result @@ -681,4 +681,12 @@ c a b 1 1 0000-00-00 3 NULL NULL drop table t1,t2; +# +# MDEV-4634 Crash in CONVERT_TZ +# +SELECT CONVERT_TZ(GREATEST(TIMESTAMP('2021-00-00'),TIMESTAMP('2022-00-00')),'+00:00','+7:5'); +CONVERT_TZ(GREATEST(TIMESTAMP('2021-00-00'),TIMESTAMP('2022-00-00')),'+00:00','+7:5') +NULL +Warnings: +Warning 1292 Incorrect datetime value: '2022-00-00 00:00:00' End of 5.3 tests diff --git a/mysql-test/r/type_time.result b/mysql-test/r/type_time.result index f2464465d60..5a047f32062 100644 --- a/mysql-test/r/type_time.result +++ b/mysql-test/r/type_time.result @@ -173,3 +173,14 @@ select f1, f1 = '2010-10-11 23:38:57' from t1; f1 f1 = '2010-10-11 23:38:57' 23:38:57 0 drop table t1; +# +# MDEV-4634 Crash in CONVERT_TZ +# +SELECT CONVERT_TZ(GREATEST(TIME('00:00:00'),TIME('00:00:00')),'+00:00','+7:5'); +CONVERT_TZ(GREATEST(TIME('00:00:00'),TIME('00:00:00')),'+00:00','+7:5') +NULL +Warnings: +Warning 1292 Incorrect datetime value: '0000-00-00 00:00:00' +# +# End of 5.3 tests +# |