diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-09-28 14:01:17 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-09-28 14:01:17 +0400 |
| commit | ad8e02ac452dc94d64b65cb9855b6dba97b651d4 (patch) | |
| tree | 7c355aab42a911476eaa10520d1adbabb7091243 /sql/item_windowfunc.h | |
| parent | 492998c0d80aa7d5c4804ac7792a38333e3b83dd (diff) | |
| download | mariadb-git-ad8e02ac452dc94d64b65cb9855b6dba97b651d4.tar.gz | |
MDEV-17317 Add THD* parameter into Item::get_date() and stricter data type control to "fuzzydate"
Diffstat (limited to 'sql/item_windowfunc.h')
| -rw-r--r-- | sql/item_windowfunc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_windowfunc.h b/sql/item_windowfunc.h index b3e23748246..5fd48af8f51 100644 --- a/sql/item_windowfunc.h +++ b/sql/item_windowfunc.h @@ -319,7 +319,7 @@ class Item_sum_hybrid_simple : public Item_sum, my_decimal *val_decimal(my_decimal *); void reset_field(); String *val_str(String *); - bool get_date(MYSQL_TIME *ltime, ulonglong fuzzydate); + bool get_date(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate); const Type_handler *type_handler() const { return Type_handler_hybrid_field_type::type_handler(); } void update_field(); @@ -1272,7 +1272,7 @@ public: return res; } - bool get_date(MYSQL_TIME *ltime, ulonglong fuzzydate) + bool get_date(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate) { bool res; if (force_return_blank) @@ -1289,7 +1289,7 @@ public: } else { - res= window_func()->get_date(ltime, fuzzydate); + res= window_func()->get_date(thd, ltime, fuzzydate); null_value= window_func()->null_value; } return res; |