diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-10-18 10:17:34 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-10-18 10:17:34 +0400 |
| commit | d3745c385ea8d371a08ae7ec12fcc10aea1b0948 (patch) | |
| tree | f2c755f84c820f62fc7300bf6f65a827f090cb99 /mysql-test/main/func_time.result | |
| parent | 475c6ec551fa8847f8993e7cb2d3ff1119f29f5a (diff) | |
| download | mariadb-git-d3745c385ea8d371a08ae7ec12fcc10aea1b0948.tar.gz | |
Fixing "mtr --ps func_time" failures in the tests added for MDEV-17351
It seems mysqltest does not print warnings raised at mysql_prepare() time.
Suppressing such --ps dependent warnings.
Diffstat (limited to 'mysql-test/main/func_time.result')
| -rw-r--r-- | mysql-test/main/func_time.result | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/mysql-test/main/func_time.result b/mysql-test/main/func_time.result index 4b134388ce8..1a1eeed5639 100644 --- a/mysql-test/main/func_time.result +++ b/mysql-test/main/func_time.result @@ -5880,8 +5880,7 @@ ADDTIME(TIME'-838:59:59.99', '87649416:59:59') AS c2, ADDTIME(TIME'-838:59:59.999', '87649416:59:59') AS c3, ADDTIME(TIME'-838:59:59.9999', '87649416:59:59') AS c4, ADDTIME(TIME'-838:59:59.99999', '87649416:59:59') AS c5, -ADDTIME(TIME'-838:59:59.999999', '87649416:59:59') AS c6, -ADDTIME(TIME'-838:59:59.9999999', '87649416:59:59') AS c7; +ADDTIME(TIME'-838:59:59.999999', '87649416:59:59') AS c6; ci NULL c1 NULL c2 NULL @@ -5889,14 +5888,7 @@ c3 NULL c4 NULL c5 NULL c6 NULL -c7 NULL Warnings: -Level Note -Code 1292 -Message Truncated incorrect time value: '-838:59:59.9999999' -Level Warning -Code 1292 -Message Incorrect INTERVAL DAY TO SECOND value: '87649416:59:59' Level Warning Code 1292 Message Incorrect INTERVAL DAY TO SECOND value: '87649416:59:59' @@ -5918,6 +5910,9 @@ Message Incorrect INTERVAL DAY TO SECOND value: '87649416:59:59' Level Warning Code 1292 Message Incorrect INTERVAL DAY TO SECOND value: '87649416:59:59' +SELECT +ADDTIME(TIME'-838:59:59.9999999', '87649416:59:59') AS c7; +c7 NULL # HOUR is max_useful_hour() (inside INTERVAL DAY TO SECOND range) # Expect max TIME(0) + zero fraction + TIME warnings + no INTEVAL warnings SELECT @@ -6060,8 +6055,7 @@ ADDTIME(TIME'-838:59:59.99', '87649415:59:59') AS c2, ADDTIME(TIME'-838:59:59.999', '87649415:59:59') AS c3, ADDTIME(TIME'-838:59:59.9999', '87649415:59:59') AS c4, ADDTIME(TIME'-838:59:59.99999', '87649415:59:59') AS c5, -ADDTIME(TIME'-838:59:59.999999', '87649415:59:59') AS c6, -ADDTIME(TIME'-838:59:59.9999999', '87649415:59:59') AS c7; +ADDTIME(TIME'-838:59:59.999999', '87649415:59:59') AS c6; ci 838:59:59 c1 838:59:59.9 c2 838:59:59.99 @@ -6069,11 +6063,7 @@ c3 838:59:59.999 c4 838:59:59.9999 c5 838:59:59.99999 c6 838:59:59.999999 -c7 838:59:59.999999 Warnings: -Level Note -Code 1292 -Message Truncated incorrect time value: '-838:59:59.9999999' Level Warning Code 1292 Message Truncated incorrect time value: '87648577:00:00' @@ -6095,9 +6085,9 @@ Message Truncated incorrect time value: '87648576:59:59.000010' Level Warning Code 1292 Message Truncated incorrect time value: '87648576:59:59.000001' -Level Warning -Code 1292 -Message Truncated incorrect time value: '87648576:59:59.000001' +SELECT +ADDTIME(TIME'-838:59:59.9999999', '87649415:59:59') AS c7; +c7 838:59:59.999999 # # MDEV-17400 The result of TIME('42949672965959-01') depends on architecture # |