mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/usr/local/bk/mysql-5.0

Browse source 
into mysql.com:/home/pem/work/mysql-5.0
This commit is contained in:
unknown 2005-06-03 12:58:23 +02:00
commit 29f3b76f58
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sql/item.h
View file

@ -585,10 +585,12 @@ public:
}
/* 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 */

6
sql/sql_yacc.yy
View file

@ -4346,11 +4346,11 @@ simple_expr:
{
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);