Commit 5370ffc9 authored by pem@mysql.comhem.se's avatar pem@mysql.comhem.se

Post review fix of BUG#10969.

parent 95484f79
...@@ -585,10 +585,12 @@ class Item_splocal : public Item ...@@ -585,10 +585,12 @@ class Item_splocal : public Item
} }
/* For error printing */ /* For error printing */
inline void my_name(char **strp, uint *lengthp) inline LEX_STRING *my_name(LEX_STRING *get_name)
{ {
*strp= m_name.str; if (!get_name)
*lengthp= m_name.length; return &m_name;
(*get_name)= m_name;
return get_name;
} }
bool is_splocal() { return 1; } /* Needed for error checking */ bool is_splocal() { return 1; } /* Needed for error checking */
......
...@@ -4346,11 +4346,11 @@ simple_expr: ...@@ -4346,11 +4346,11 @@ simple_expr:
{ {
if ($3->is_splocal()) if ($3->is_splocal())
{ {
LEX_STRING name; LEX_STRING *name;
Item_splocal *il= static_cast<Item_splocal *>($3); Item_splocal *il= static_cast<Item_splocal *>($3);
il->my_name(&name.str, &name.length); name= il->my_name(NULL);
my_error(ER_WRONG_COLUMN_NAME, MYF(0), name.str); my_error(ER_WRONG_COLUMN_NAME, MYF(0), name->str);
YYABORT; YYABORT;
} }
$$= new Item_default_value($3); $$= new Item_default_value($3);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment