5.5 merge

This commit is contained in:
Sergei Golubchik 2013-03-27 23:41:02 +01:00
commit 993ea79f2d
627 changed files with 17002 additions and 18008 deletions

View file

@ -4453,8 +4453,7 @@ Create_func_make_set::create_native(THD *thd, LEX_STRING name,
return NULL;
}
Item *param_1= item_list->pop();
return new (thd->mem_root) Item_func_make_set(param_1, *item_list);
return new (thd->mem_root) Item_func_make_set(*item_list);
}