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 /sql/item_strfunc.h | |
| 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 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 7606c281548..00ae60a7fb1 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -62,7 +62,6 @@ public: enum Item_result result_type () const { return STRING_RESULT; } void left_right_max_length(); bool fix_fields(THD *thd, Item **ref); - String *val_str_from_val_str_ascii(String *str, String *str2); }; |