diff options
| author | Evgeny Potemkin <epotemkin@mysql.com> | 2009-12-14 17:17:41 +0300 |
|---|---|---|
| committer | Evgeny Potemkin <epotemkin@mysql.com> | 2009-12-14 17:17:41 +0300 |
| commit | 5466618420b2710e11f2f61482696d22e64313c5 (patch) | |
| tree | fed6e3b990ac3beeaf6b7b3f642fd439516729e4 /sql/item_sum.cc | |
| parent | bc2d4e620ac81824b2e30bf8a1c92e164717b2e1 (diff) | |
| download | mariadb-git-5466618420b2710e11f2f61482696d22e64313c5.tar.gz | |
Post-merge fix.
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index d925c68e66c..831f0287266 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1207,7 +1207,8 @@ void Item_sum_hybrid::setup(Item *item, Item *value_arg) { value= Item_cache::get_cache(item); value->setup(item); - value->store(value_arg); + if (value_arg) + value->store(value_arg); cmp= new Arg_comparator(); cmp->set_cmp_func(this, args, (Item**)&value, FALSE); collation.set(item->collation); |