diff options
author | Alexander Barkov <bar@mariadb.org> | 2017-05-07 19:29:23 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.org> | 2017-05-07 19:29:23 +0400 |
commit | da63db1e3b174209a4de1fe8e66e9bbe9ac3b11d (patch) | |
tree | 370a1a4185a509081ca87b5aa4df75a1141cdc5b /sql/item_windowfunc.cc | |
parent | 02ada41744382fea11621a5a8094cbbea06c9487 (diff) | |
download | mariadb-git-da63db1e3b174209a4de1fe8e66e9bbe9ac3b11d.tar.gz |
MDEV-12719 Determine Item::result_type() from Item::type_handler()
Diffstat (limited to 'sql/item_windowfunc.cc')
-rw-r--r-- | sql/item_windowfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_windowfunc.cc b/sql/item_windowfunc.cc index 7117ac69548..6ab903a81bb 100644 --- a/sql/item_windowfunc.cc +++ b/sql/item_windowfunc.cc @@ -250,7 +250,7 @@ bool Item_sum_hybrid_simple::fix_fields(THD *thd, Item **ref) set_handler_by_result_type(item2->result_type(), max_length, collation.collation); - switch (Item_sum_hybrid_simple::result_type()) { + switch (result_type()) { case INT_RESULT: case DECIMAL_RESULT: case STRING_RESULT: @@ -352,7 +352,7 @@ Field *Item_sum_hybrid_simple::create_tmp_field(bool group, TABLE *table) void Item_sum_hybrid_simple::reset_field() { - switch(Item_sum_hybrid_simple::result_type()) { + switch(result_type()) { case STRING_RESULT: { char buff[MAX_FIELD_WIDTH]; |