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

5.3->5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-02-28 22:47:29 +01:00
parent cfa94b4338 c4341d5095
commit 213f1c76a0
52 changed files with 1825 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.cc
View File

@@ -3458,9 +3458,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);
}