diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-28 10:01:50 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-28 10:01:50 +0200 |
| commit | a8de8f261d1b7621b8e16396e87dfaac14891162 (patch) | |
| tree | 9b8ec45858c2757305e0bdecf237fcb59251020c /sql/item_timefunc.h | |
| parent | e183aec1d75ea7b424ebe237e6b1643961903f2d (diff) | |
| parent | 42e1815ad850384fad292534665ff61b78dd96f6 (diff) | |
| download | mariadb-git-a8de8f261d1b7621b8e16396e87dfaac14891162.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index 8b39092e09a..518b573173f 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -989,7 +989,7 @@ public: bool get_date(MYSQL_TIME *res, ulonglong fuzzy_date); bool eq(const Item *item, bool binary_cmp) const; void print(String *str, enum_query_type query_type); - enum precedence precedence() const { return ADDINTERVAL_PRECEDENCE; } + enum precedence precedence() const { return INTERVAL_PRECEDENCE; } bool need_parentheses_in_default() { return true; } Item *get_copy(THD *thd) { return get_item_copy<Item_date_add_interval>(thd, this); } |