mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
This patch does 1) fix my build breakage 2) Complete the removal of all symbols which could clash with another parser.
sql/mysql_priv.h: Porting update sql/mysqld.cc: Porting update sql/sp.cc: Porting update sql/sql_lex.cc: Porting update sql/sql_lex.h: Porting update sql/sql_parse.cc: Porting update sql/sql_prepare.cc: Portinng update sql/sql_trigger.cc: Porting update sql/sql_view.cc: Porting update
This commit is contained in:
@ -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);
|
||||
|
||||
|
Reference in New Issue
Block a user