From: Date: April 18 2006 11:16am
Subject: bk commit into 5.0 tree (pem:1.2137) BUG#18787
List-Archive: http://lists.mysql.com/commits/5068
X-Bug: 18787
Message-Id: <200604180916.k3I9Gg0M005443@mail.mysql.com>

Below is the list of changes that have just been committed into a local
5.0 repository of pem. When pem 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.2137 06/04/18 11:16:39 pem@stripped +1 -0
  Post-review fix for BUG#18787. Renamed a local variable in
  Item_func_sp::tmp_table_field() to something more descriptive.

  sql/item_func.cc
    1.278 06/04/18 11:16:35 pem@stripped +6 -6
    Renamed local variable 'res' to 'field' in Item_func_sp::tmp_table_field(),
    because it is.

# 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:	pem
# Host:	pem.mysql.com
# Root:	/extern/mysql/5.0/bug18787/mysql-5.0-runtime

--- 1.277/sql/item_func.cc	2006-04-11 12:17:52 +02:00
+++ 1.278/sql/item_func.cc	2006-04-18 11:16:35 +02:00
@@ -4909,19 +4909,19 @@
 Field *
 Item_func_sp::tmp_table_field(TABLE *t_arg)
 {
-  Field *res= 0;
+  Field *field= 0;
   DBUG_ENTER("Item_func_sp::tmp_table_field");
 
   if (m_sp)
-    res= m_sp->create_result_field(max_length, (const char*) name, t_arg);
+    field= m_sp->create_result_field(max_length, (const char*) name, t_arg);
   
-  if (!res) 
-    res= Item_func::tmp_table_field(t_arg);
+  if (!field) 
+    field= Item_func::tmp_table_field(t_arg);
 
-  if (!res)
+  if (!field)
     my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
 
-  DBUG_RETURN(res);
+  DBUG_RETURN(field);
 }