Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint

into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
This commit is contained in:
cmiller@maint1.mysql.com 2006-08-23 17:37:18 +02:00
commit 5572348ba5
4 changed files with 30 additions and 2 deletions

View file

@ -1040,6 +1040,8 @@ int MYSQLlex(void *arg, void *yythd)
if (c == '.')
lex->next_state=MY_LEX_IDENT_SEP;
length= (uint) (lex->ptr - lex->tok_start)-1;
if (length == 0)
return(ABORT_SYM); // Names must be nonempty.
if ((tokval= find_keyword(lex,length,0)))
{
yyUnget(); // Put back 'c'