mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-30 04:05:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

10.0-base merge

Browse source
This commit is contained in:
Sergei Golubchik 2013-12-16 13:02:21 +01:00
commit d28d3ba40d
1367 changed files with 67982 additions and 41096 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/item_sum.cc
View file

@ -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);