diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-10-30 16:13:13 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-10-30 16:13:13 +0200 |
| commit | a765de73fe0cd0b0646d6043b6f2833d1572c8ad (patch) | |
| tree | 6a00ee58df5b3a92ba529b59849170a93e96accc /sql/sql_class.cc | |
| parent | e8c608fe721bc1bedc6df0d0c8330643501c5b74 (diff) | |
| parent | a0bea5eeb197beaa46bf80c5096d9cf934bf25df (diff) | |
| download | mariadb-git-a765de73fe0cd0b0646d6043b6f2833d1572c8ad.tar.gz | |
merge
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 080839e9b42..ddcd1cee4e9 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -2723,9 +2723,11 @@ bool select_dumpvar::send_data(List<Item> &items) else { Item_func_set_user_var *suv= new Item_func_set_user_var(mv->s, item); - suv->fix_fields(thd, 0); + if (suv->fix_fields(thd, 0)) + DBUG_RETURN (1); suv->save_item_result(item); - suv->update(); + if (suv->update()) + DBUG_RETURN (1); } } DBUG_RETURN(thd->is_error()); |