diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-07-27 18:32:42 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-07-27 18:32:42 +0400 |
| commit | c4c678f653077f6ca93bd8b50906410e29d4b127 (patch) | |
| tree | f5b4dd56c20ccff8f87fcf2ff244d4be368ac972 /sql/item_sum.cc | |
| parent | 740c0d3a87c07dd5f482db5705449143993e7385 (diff) | |
| parent | 8ee568cde7bef3893f5500d07ef45cb58107cff3 (diff) | |
| download | mariadb-git-c4c678f653077f6ca93bd8b50906410e29d4b127.tar.gz | |
Merge trunk-bugfixing -> trunk-runtime.
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 77c45ea85f7..b05d845dead 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1214,8 +1214,7 @@ void Item_sum_hybrid::setup_hybrid(Item *item, Item *value_arg) { value= Item_cache::get_cache(item); value->setup(item); - if (value_arg) - value->store(value_arg); + value->store(value_arg); cmp= new Arg_comparator(); cmp->set_cmp_func(this, args, (Item**)&value, FALSE); collation.set(item->collation); @@ -1903,7 +1902,7 @@ void Item_sum_variance::update_field() void Item_sum_hybrid::clear() { - value->null_value= 1; + value->clear(); null_value= 1; } |