From: Date: December 6 2006 1:13pm
Subject: bk commit into 5.0 tree (ramil:1.2338) BUG#23782
List-Archive: http://lists.mysql.com/commits/16511
X-Bug: 23782
Message-Id: <200612061213.kB6CDfdK087636@myoffice.izhnet.ru>

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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-06 16:13:34+04:00, ramil@stripped +1 -0
  Fix for bug #23782: Stored procedures: crash if variable in procedure analyse
  
  We have to call fix_fields() for procedure analyse' arguments as they may not be
  fixed in some circumstances.
  Test case will be added later (when we have binlog_disabled.test).

  sql/sql_analyse.cc@stripped, 2006-12-06 16:13:29+04:00, ramil@stripped +4 -0
    Fix for bug #23782: Stored procedures: crash if variable in procedure analyse
      - call fix_fields() if arguments are not fixed.

# 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:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/bug23782/my50-bug23782

--- 1.68/sql/sql_analyse.cc	2006-12-06 16:13:41 +04:00
+++ 1.69/sql/sql_analyse.cc	2006-12-06 16:13:41 +04:00
@@ -87,6 +87,8 @@ proc_analyse_init(THD *thd, ORDER *param
   else if (param->next)
   {
     // first parameter
+    if (!(*param->item)->fixed && (*param->item)->fix_fields(thd, param->item))
+      goto err;
     if ((*param->item)->type() != Item::INT_ITEM ||
 	(*param->item)->val_real() < 0)
     {
@@ -101,6 +103,8 @@ proc_analyse_init(THD *thd, ORDER *param
       goto err;
     }
     // second parameter
+    if (!(*param->item)->fixed && (*param->item)->fix_fields(thd, param->item))
+      goto err; 
     if ((*param->item)->type() != Item::INT_ITEM ||
 	(*param->item)->val_real() < 0)
     {