diff options
| author | brian@zim.(none) <> | 2005-08-30 14:40:02 -0700 |
|---|---|---|
| committer | brian@zim.(none) <> | 2005-08-30 14:40:02 -0700 |
| commit | 57403ddc9da2a2fa153629f3564c662cb0de405e (patch) | |
| tree | fb387d75c6bc8131e0d735a74cc6ab053e56c186 /sql/sql_lex.cc | |
| parent | b423cbf2ce44e7abf162b4a59e288c1562a2e39e (diff) | |
| parent | 2b0c81c984af1ab4d9f30b2d089102a13f507079 (diff) | |
| download | mariadb-git-57403ddc9da2a2fa153629f3564c662cb0de405e.tar.gz | |
Merge zim.(none):/home/brian/mysql/mysql-5.0
into zim.(none):/home/brian/mysql/mysql-5.1
Resolved to minor issues.
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 9132d3177fc..623dd48b39d 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -518,6 +518,10 @@ int yylex(void *arg, void *yythd) uchar *ident_map= cs->ident_map; lex->yylval=yylval; // The global state + + lex->tok_end_prev= lex->tok_end; + lex->tok_start_prev= lex->tok_start; + lex->tok_start=lex->tok_end=lex->ptr; state=lex->next_state; lex->next_state=MY_LEX_OPERATOR_OR_IDENT; |