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

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.
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

View File

@ -2954,8 +2954,14 @@ SELECT
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.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;
--enable_warnings
--echo # HOUR is max_useful_hour() (inside INTERVAL DAY TO SECOND range)
--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.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;
# 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