diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-12-19 14:28:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-12-19 14:28:08 +0400 |
| commit | 2f6fede8d5f7e98319b4b7b557bd565fdb42fac3 (patch) | |
| tree | f57ad1b04932d80eb36f05a5ef55cb62dece012c /mysql-test/t/func_time.test | |
| parent | c4d9dc705b781bb155aab8f04cece2b87116d3c1 (diff) | |
| download | mariadb-git-2f6fede8d5f7e98319b4b7b557bd565fdb42fac3.tar.gz | |
MDEV-10524 Assertion `arg1_int >= 0' failed in Item_func_additive_op::result_precision()
This change is a backport from 10.0 to 5.5 for:
1. The full patch for:
MDEV-4841 Wrong character set of ADDTIME() and DATE_ADD()
9adb6e991ec87b65d04929f115d9d0c899e4ab19
2. A small fragment of:
MDEV-5298 Illegal mix of collations on timestamp
03f6778d61a74bdd7d09103a16473a2a5624cf66
which overrides Item_temporal_hybrid_func::cmp_type(),
and adds a new line into cache_temporal_4265.result.
Diffstat (limited to 'mysql-test/t/func_time.test')
| -rw-r--r-- | mysql-test/t/func_time.test | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index 45214aed6e7..92e1c38cec2 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -1597,3 +1597,8 @@ INSERT INTO t1 VALUES (17, NULL); INSERT INTO t1 VALUES (18, '2010-10-13'); SELECT a.id,a.date1,FROM_DAYS(TO_DAYS(a.date1)-10) as date2, DATE_ADD(a.date1,INTERVAL -10 DAY),TO_DAYS(a.date1)-10 FROM t1 a ORDER BY a.id; DROP TABLE t1; + +--echo # +--echo # MDEV-10524 Assertion `arg1_int >= 0' failed in Item_func_additive_op::result_precision() +--echo # +SELECT 1 MOD ADDTIME( '13:58:57', '00:00:01' ) + 2; |