diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-11-21 13:09:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-11-21 13:09:08 +0400 |
| commit | c7355b19828c37d8efb9f1d4b5010544aa110bd4 (patch) | |
| tree | b74e960c3447f7c3c876c1262e5703c7dcf75b4f /sql/item_sum.cc | |
| parent | 160236f880e92d2872d95ce72aab144f08456bcc (diff) | |
| parent | 2394fa67d4908f62ef14f3ca90269fb32806d193 (diff) | |
| download | mariadb-git-c7355b19828c37d8efb9f1d4b5010544aa110bd4.tar.gz | |
Merge 5.3->5.5
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 7c2eea6258b..092531c1c9e 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1250,7 +1250,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); |