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.test | |
| 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.test')
| -rw-r--r-- | mysql-test/main/func_time.test | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/mysql-test/main/func_time.test b/mysql-test/main/func_time.test index 69fd12448eb..8fc0977a496 100644 --- a/mysql-test/main/func_time.test +++ b/mysql-test/main/func_time.test @@ -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 |