bk commit into 5.0 tree (sergefp:1.1922)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey 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.1922 05/08/25 17:39:02 sergefp@stripped +3 -0
  Merge spetrunia@stripped:/home/bk/mysql-5.0
  into mysql.com:/home/psergey/mysql-5.0-bug12335-release2

  sql/sql_yacc.yy
    1.418 05/08/25 17:39:01 sergefp@stripped +0 -0
    Auto merged

  sql/mysql_priv.h
    1.344 05/08/25 17:39:01 sergefp@stripped +0 -0
    Auto merged

  sql/lex.h
    1.141 05/08/25 17:39:00 sergefp@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:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.0-bug12335-release2/RESYNC

--- 1.140/sql/lex.h	2005-08-25 02:50:54 +04:00
+++ 1.141/sql/lex.h	2005-08-25 17:39:00 +04:00
@@ -696,6 +696,7 @@
   { "MULTIPOINTFROMWKB",SYM(GEOMFROMWKB)},
   { "MULTIPOLYGONFROMTEXT",SYM(MPOLYFROMTEXT)},
   { "MULTIPOLYGONFROMWKB",SYM(GEOMFROMWKB)},
+  { "NAME_CONST",       F_SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_name_const)},
   { "NOW",		SYM(NOW_SYM)},
   { "NULLIF",		F_SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_nullif)},
   { "NUMGEOMETRIES",	F_SYM(FUNC_ARG1),0,CREATE_FUNC_GEOM(create_func_numgeometries)},

--- 1.343/sql/mysql_priv.h	2005-08-25 07:05:54 +04:00
+++ 1.344/sql/mysql_priv.h	2005-08-25 17:39:01 +04:00
@@ -34,6 +34,7 @@
 #include <thr_lock.h>
 #include <my_base.h>			/* Needed by field.h */
 #include "sql_bitmap.h"
+#include "sql_array.h"
 
 #ifdef __EMX__
 #undef write  /* remove pthread.h macro definition for EMX */

--- 1.417/sql/sql_yacc.yy	2005-08-25 02:50:54 +04:00
+++ 1.418/sql/sql_yacc.yy	2005-08-25 17:39:01 +04:00
@@ -7138,10 +7138,13 @@
 	  sp_pvar_t *spv;
 	  LEX *lex = Lex;
           sp_pcontext *spc = lex->spcont;
-
 	  if (spc && (spv = spc->find_pvar(&$1)))
-	  { /* We're compiling a stored procedure and found a variable */
-	    $$ = (Item*) new Item_splocal($1, spv->offset);
+	  {
+            /* We're compiling a stored procedure and found a variable */
+            Item_splocal *splocal;
+            splocal= new Item_splocal($1, spv->offset, lex->tok_start_prev - 
+                                      lex->sphead->m_tmp_query);
+	    $$ = (Item*) splocal;
             lex->variables_used= 1;
 	    lex->safe_to_cache_query=0;
 	  }