summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authoriggy@rolltop.ignatz42.dyndns.org <>2006-12-05 09:41:02 -0500
committeriggy@rolltop.ignatz42.dyndns.org <>2006-12-05 09:41:02 -0500
commitc1c082af86f961f6a294071bc34d81031a9cc957 (patch)
tree57a8dbbce3a31b2ee96eeabf84ec00906518337b /sql
parent011b090c624993932c604d96bec4460150d8b379 (diff)
parent5dcf553159a485744928fa0c8c0b120d18e0ac78 (diff)
downloadmariadb-git-c1c082af86f961f6a294071bc34d81031a9cc957.tar.gz
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_class.cc8
1 files changed, 0 insertions, 8 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 924a7237e65..869273573f8 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -1962,14 +1962,6 @@ bool select_dumpvar::send_data(List<Item> &items)
else
{
Item_func_set_user_var *suv= new Item_func_set_user_var(mv->s, item);
-
- /*
- Item_func_set_user_var can't substitute something else on its
- place => NULL may be passed as last argument (reference on
- item) Item_func_set_user_var can't be fixed after creation, so
- we do not check var->fixed
- */
-
suv->fix_fields(thd, 0);
suv->check(0);
suv->update();