1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

5.1 -> 5.2 merge

This commit is contained in:
Sergei Golubchik
2013-02-28 19:00:58 +01:00
115 changed files with 2396 additions and 1030 deletions

View File

@@ -3072,9 +3072,9 @@ int select_dumpvar::send_data(List<Item> &items)
else
{
Item_func_set_user_var *suv= new Item_func_set_user_var(mv->s, item);
suv->save_item_result(item);
if (suv->fix_fields(thd, 0))
DBUG_RETURN (1);
suv->save_item_result(item);
if (suv->update())
DBUG_RETURN (1);
}