diff options
| author | unknown <cmiller@maint1.mysql.com> | 2006-08-15 19:34:53 +0200 |
|---|---|---|
| committer | unknown <cmiller@maint1.mysql.com> | 2006-08-15 19:34:53 +0200 |
| commit | 3ba57ead65ef46b97084e06acd1eee47670f4587 (patch) | |
| tree | c92f147ca9bd11aeefc3458f174dc0d5521dc524 /sql/sql_lex.cc | |
| parent | f79f64b6704480072d10dae61df3d6ae7af4ed82 (diff) | |
| parent | e0bffad3e8c121d81e1e64682d7fc8bc5aad8fcf (diff) | |
| download | mariadb-git-3ba57ead65ef46b97084e06acd1eee47670f4587.tar.gz | |
Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my50-bug20908
into maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
sql/sql_lex.cc:
Auto merged
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index bb66fde79fe..1612b12125f 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1043,6 +1043,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' |