diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-23 00:50:54 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-23 00:50:54 +0100 |
| commit | c6d30805db3a1a2a098c3009fde8a42efd9fb9de (patch) | |
| tree | e55f68e5adf40e1a75e08bda91b712ab6a094643 /sql/item_sum.cc | |
| parent | 2c032b990e4ec470fad2e9f61cf6267a68b7e937 (diff) | |
| parent | eea310e498f3b7ac95a4492d48f04e08d3009412 (diff) | |
| download | mariadb-git-c6d30805db3a1a2a098c3009fde8a42efd9fb9de.tar.gz | |
5.5 merge
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index b4ecb66fc46..9f2c3f074b6 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1266,7 +1266,7 @@ Item_sum_hybrid::fix_fields(THD *thd, Item **ref) void Item_sum_hybrid::setup_hybrid(Item *item, Item *value_arg) { - if (!(value= Item_cache::get_cache(item))) + if (!(value= Item_cache::get_cache(item, item->cmp_type()))) return; value->setup(item); value->store(value_arg); |