bk commit into 5.0 tree (pem:1.1958) BUG#10969

[pem]

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.1958 05/06/03 12:56:51 pem@stripped +2 -0
  Post review fix of BUG#10969.

  sql/sql_yacc.yy
    1.388 05/06/03 12:56:45 pem@stripped +3 -3
    Name returned as LEX_STRING instead of its components.

  sql/item.h
    1.133 05/06/03 12:56:45 pem@stripped +5 -3
    Return name as LEX_STRING instead of its components.

# 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:	mysql.comhem.se
# Root:	/home/pem/work/mysql-5.0

--- 1.132/sql/item.h	Wed Jun  1 15:42:34 2005
+++ 1.133/sql/item.h	Fri Jun  3 12:56:45 2005
@@ -585,10 +585,12 @@
   }
 
   /* For error printing */
-  inline void my_name(char **strp, uint *lengthp)
+  inline LEX_STRING *my_name(LEX_STRING *get_name)
   {
-    *strp= m_name.str;
-    *lengthp= m_name.length;
+    if (!get_name)
+      return &m_name;
+    (*get_name)= m_name;
+    return get_name;
   }
 
   bool is_splocal() { return 1; } /* Needed for error checking */

--- 1.387/sql/sql_yacc.yy	Wed Jun  1 15:50:44 2005
+++ 1.388/sql/sql_yacc.yy	Fri Jun  3 12:56:45 2005
@@ -4346,11 +4346,11 @@
 	  {
 	    if ($3->is_splocal())
 	    {
-	      LEX_STRING name;
+	      LEX_STRING *name;
 	      Item_splocal *il= static_cast<Item_splocal *>($3);
 
-	      il->my_name(&name.str, &name.length);
-	      my_error(ER_WRONG_COLUMN_NAME, MYF(0), name.str);
+	      name= il->my_name(NULL);
+	      my_error(ER_WRONG_COLUMN_NAME, MYF(0), name->str);
 	      YYABORT;
 	    }
 	    $$= new Item_default_value($3);