bk commit into 5.1 tree (malff:1.2550)

[marc.alff]

Below is the list of changes that have just been committed into a local
5.1 repository of marcsql. When marcsql 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-06-13 07:31:41-06:00, malff@weblab.(none) +1 -0
  Fixed valgrind error, caused by incorrect pointer arithetic

  sql/sql_yacc.yy@stripped, 2007-06-13 07:31:37-06:00, malff@weblab.(none) +2 -4
    Fixed valgrind error: the same buffer (preprocessed) should be used when extracting
the text of expr

# 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:	malff
# Host:	weblab.(none)
# Root:	/home/marcsql/TREE/mysql-5.1-rt-valgrind

--- 1.579/sql/sql_yacc.yy	2007-06-13 07:31:48 -06:00
+++ 1.580/sql/sql_yacc.yy	2007-06-13 07:31:48 -06:00
@@ -8006,16 +8006,14 @@ procedure_list2:
 	| procedure_item;
 
 procedure_item:
-	  remember_name expr
+	  remember_name expr remember_end
 	  {
             THD *thd= YYTHD;
-            Lex_input_stream *lip= thd->m_lip;
 
 	    if (add_proc_to_list(thd, $2))
 	      MYSQL_YYABORT;
 	    if (!$2->name)
-              $2->set_name($1,(uint) ((char*) lip->get_tok_end() - $1),
-                           thd->charset());
+              $2->set_name($1, (uint) ($3 - $1), thd->charset());
 	  }
           ;