bk commit into 5.1 tree (iggy:1.2351)

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.1 repository of iggy. When iggy does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-12-05 09:41:02-05:00, iggy@stripped +1 -0
  Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
  into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836
  MERGE: 1.1810.1698.174

  sql/sql_class.cc@stripped, 2006-12-05 09:40:58-05:00, iggy@stripped +0
-0
    Auto merged
    MERGE: 1.223.1.33

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	iggy
# Host:	rolltop.ignatz42.dyndns.org
# Root:	/mnt/storeage/bug20836/my51-bug20836/RESYNC

--- 1.296/sql/sql_class.cc	2006-12-05 09:41:10 -05:00
+++ 1.297/sql/sql_class.cc	2006-12-05 09:41:10 -05:00
@@ -1962,14 +1962,6 @@ bool select_dumpvar::send_data(List<Item
     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();