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

Fixing "mtr --ps func_time" failures in the tests added for MDEV-17351

Browse Source 
It seems mysqltest does not print warnings raised at mysql_prepare() time.

Suppressing such --ps dependent warnings.
This commit is contained in:
Alexander Barkov
2018-10-18 10:17:34 +04:00
parent 475c6ec551
commit d3745c385e
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mysql-test/main/func_time.result
View File

@ -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.999', '87649416:59:59') AS c3,
ADDTIME(TIME'-838:59:59.9999', '87649416:59:59') AS c4, 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.99999', '87649416:59:59') AS c5,
ADDTIME(TIME'-838:59:59.999999', '87649416:59:59') AS c6, ADDTIME(TIME'-838:59:59.999999', '87649416:59:59') AS c6;
ADDTIME(TIME'-838:59:59.9999999', '87649416:59:59') AS c7;
ci NULL ci NULL
c1 NULL c1 NULL
c2 NULL c2 NULL
@ -5889,14 +5888,7 @@ c3 NULL
c4 NULL c4 NULL
c5 NULL c5 NULL
c6 NULL c6 NULL
c7 NULL
Warnings: 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 Level Warning
Code 1292 Code 1292
Message Incorrect INTERVAL DAY TO SECOND value: '87649416:59:59' 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 Level Warning
Code 1292 Code 1292
Message Incorrect INTERVAL DAY TO SECOND value: '87649416:59:59' 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) # HOUR is max_useful_hour() (inside INTERVAL DAY TO SECOND range)
# Expect max TIME(0) + zero fraction + TIME warnings + no INTEVAL warnings # Expect max TIME(0) + zero fraction + TIME warnings + no INTEVAL warnings
SELECT 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.999', '87649415:59:59') AS c3,
ADDTIME(TIME'-838:59:59.9999', '87649415:59:59') AS c4, 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.99999', '87649415:59:59') AS c5,
ADDTIME(TIME'-838:59:59.999999', '87649415:59:59') AS c6, ADDTIME(TIME'-838:59:59.999999', '87649415:59:59') AS c6;
ADDTIME(TIME'-838:59:59.9999999', '87649415:59:59') AS c7;
ci 838:59:59 ci 838:59:59
c1 838:59:59.9 c1 838:59:59.9
c2 838:59:59.99 c2 838:59:59.99
@ -6069,11 +6063,7 @@ c3 838:59:59.999
c4 838:59:59.9999 c4 838:59:59.9999
c5 838:59:59.99999 c5 838:59:59.99999
c6 838:59:59.999999 c6 838:59:59.999999
c7 838:59:59.999999
Warnings: Warnings:
Level Note
Code 1292
Message Truncated incorrect time value: '-838:59:59.9999999'
Level Warning Level Warning
Code 1292 Code 1292
Message Truncated incorrect time value: '87648577:00:00' Message Truncated incorrect time value: '87648577:00:00'
@ -6095,9 +6085,9 @@ Message Truncated incorrect time value: '87648576:59:59.000010'
Level Warning Level Warning
Code 1292 Code 1292
Message Truncated incorrect time value: '87648576:59:59.000001' Message Truncated incorrect time value: '87648576:59:59.000001'
Level Warning SELECT
Code 1292 ADDTIME(TIME'-838:59:59.9999999', '87649415:59:59') AS c7;
Message Truncated incorrect time value: '87648576:59:59.000001' c7 838:59:59.999999
# #
# MDEV-17400 The result of TIME('42949672965959-01') depends on architecture # MDEV-17400 The result of TIME('42949672965959-01') depends on architecture
# #

17
mysql-test/main/func_time.test
View File

@ -2954,8 +2954,14 @@ SELECT
ADDTIME(TIME'-838:59:59.999', '87649416:59:59') AS c3, 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.9999', '87649416:59:59') AS c4,
ADDTIME(TIME'-838:59:59.99999', '87649416:59:59') AS c5, 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.999999', '87649416:59:59') AS c6;
# This does not give a warning about nanosecond truncation in --ps runs
# so disable warnings
--disable_warnings
SELECT
ADDTIME(TIME'-838:59:59.9999999', '87649416:59:59') AS c7; ADDTIME(TIME'-838:59:59.9999999', '87649416:59:59') AS c7;
--enable_warnings
--echo # HOUR is max_useful_hour() (inside INTERVAL DAY TO SECOND range) --echo # HOUR is max_useful_hour() (inside INTERVAL DAY TO SECOND range)
--echo # Expect max TIME(0) + zero fraction + TIME warnings + no INTEVAL warnings --echo # Expect max TIME(0) + zero fraction + TIME warnings + no INTEVAL warnings
@ -3001,9 +3007,14 @@ SELECT
ADDTIME(TIME'-838:59:59.999', '87649415:59:59') AS c3, 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.9999', '87649415:59:59') AS c4,
ADDTIME(TIME'-838:59:59.99999', '87649415:59:59') AS c5, 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.999999', '87649415:59:59') AS c6;
ADDTIME(TIME'-838:59:59.9999999', '87649415:59:59') AS c7;
# This does not give a warning about nanosecond truncation in --ps runs
# so disable warnings
--disable_warnings
SELECT
ADDTIME(TIME'-838:59:59.9999999', '87649415:59:59') AS c7;
--enable_warnings
--horizontal_results --horizontal_results