diff options
| author | brian@zim.(none) <> | 2006-03-09 16:44:08 -0800 |
|---|---|---|
| committer | brian@zim.(none) <> | 2006-03-09 16:44:08 -0800 |
| commit | eefd1207bb8d422944add4bb9cad64070bf47f13 (patch) | |
| tree | 407275d5a687e4a6876141135931177d388ddc23 /sql/sql_lex.h | |
| parent | 78abb2d117d46735e2d45dc6e4e7eae7350cae04 (diff) | |
| download | mariadb-git-eefd1207bb8d422944add4bb9cad64070bf47f13.tar.gz | |
This patch does 1) fix my build breakage 2) Complete the removal of all symbols which could clash with another parser.
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 8bacc60d48d..8512c075f69 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -716,7 +716,7 @@ typedef struct st_lex uchar *buf; /* The beginning of string, used by SPs */ uchar *ptr,*tok_start,*tok_end,*end_of_query; - /* The values of tok_start/tok_end as they were one call of yylex before */ + /* The values of tok_start/tok_end as they were one call of MYSQLlex before */ uchar *tok_start_prev, *tok_end_prev; char *length,*dec,*change,*name; @@ -1065,7 +1065,7 @@ extern void lex_init(void); extern void lex_free(void); extern void lex_start(THD *thd, uchar *buf,uint length); extern void lex_end(LEX *lex); -extern int yylex(void *arg, void *yythd); +extern int MYSQLlex(void *arg, void *yythd); extern pthread_key(LEX*,THR_LEX); |