From: dlenev
Date: December 7 2005 6:22pm
Subject: bk commit into 5.0 tree (dlenev:1.1989)
List-Archive: http://lists.mysql.com/commits/25
Message-Id: <20051207182204.16D5C130487@brandersnatch.site>

Below is the list of changes that have just been committed into a local
5.0 repository of dlenev. When dlenev 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
  1.1989 05/12/07 21:21:54 dlenev@stripped +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/dlenev/src/mysql-5.0-merges

  sql/sp_head.cc
    1.202 05/12/07 21:21:47 dlenev@stripped +0 -0
    Auto merged

# 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:	dlenev
# Host:	brandersnatch.site
# Root:	/home/dlenev/src/mysql-5.0-merges/RESYNC

--- 1.201/sql/sp_head.cc	2005-12-07 20:31:02 +03:00
+++ 1.202/sql/sp_head.cc	2005-12-07 21:21:47 +03:00
@@ -1518,8 +1518,8 @@
             Item_func_set_user_var is not fixed after construction,
             call fix_fields().
 	  */
-          if ((ret= test(!suv || suv->fix_fields(thd, &item) ||
-                         suv->check() || suv->update())))
+          if ((err_status= test(!suv || suv->fix_fields(thd, &item) ||
+                                suv->check() || suv->update())))
             break;
 	}
       }