bk commit into 5.1 tree (anozdrin:1.2528)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.1 repository of alik. When alik 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, 2007-05-30 16:24:21+04:00, anozdrin@ibm. +2 -0
  1. Fix memory leak.
  2. Use multibyte-safe constant.

  sql/sp.cc@stripped, 2007-05-30 16:24:18+04:00, anozdrin@ibm. +3 -3
    Fix memory leak.

  sql/sp_head.cc@stripped, 2007-05-30 16:24:18+04:00, anozdrin@ibm. +1 -1
    Use multibyte-safe constant.

# 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:	anozdrin
# Host:	ibm.
# Root:	/home/alik/Documents/MySQL/devel/5.1-rt-valgrind

--- 1.152/sql/sp.cc	2007-05-29 21:22:31 +04:00
+++ 1.153/sql/sp.cc	2007-05-30 16:24:18 +04:00
@@ -1014,8 +1014,8 @@
 {
   bool err_status= TRUE;
   sp_head *sp;
-  sp_cache *cache = type == TYPE_ENUM_PROCEDURE ?
-                    thd->sp_proc_cache : thd->sp_func_cache;
+  sp_cache **cache = type == TYPE_ENUM_PROCEDURE ?
+                     &thd->sp_proc_cache : &thd->sp_func_cache;
 
   DBUG_ENTER("sp_show_create_routine");
   DBUG_PRINT("enter", ("name: %.*s", name->m_name.length, name->m_name.str));
@@ -1038,7 +1038,7 @@
     thd->variables.max_sp_recursion_depth++;
   }
 
-  if ((sp= sp_find_routine(thd, type, name, &cache, FALSE)))
+  if ((sp= sp_find_routine(thd, type, name, cache, FALSE)))
     err_status= sp->show_create_routine(thd, type);
 
   if (type == TYPE_ENUM_PROCEDURE)

--- 1.274/sql/sp_head.cc	2007-05-30 00:53:18 +04:00
+++ 1.275/sql/sp_head.cc	2007-05-30 16:24:18 +04:00
@@ -2141,7 +2141,7 @@
 
   /* Send header. */
 
-  fields.push_back(new Item_empty_string(col1_caption, NAME_LEN));
+  fields.push_back(new Item_empty_string(col1_caption, NAME_CHAR_LEN));
   fields.push_back(new Item_empty_string("sql_mode", sql_mode.length));
 
   {