diff options
| author | unknown <brian@zim.(none)> | 2006-03-09 16:44:08 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-03-09 16:44:08 -0800 |
| commit | 01d69c4b966015a7fc5806d337e3006b22baed47 (patch) | |
| tree | 407275d5a687e4a6876141135931177d388ddc23 /sql/sql_lex.cc | |
| parent | 85d705b651cf9057f2d687294044f173880675c3 (diff) | |
| download | mariadb-git-01d69c4b966015a7fc5806d337e3006b22baed47.tar.gz | |
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
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 110c82f6926..2b31abd6a50 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -507,14 +507,14 @@ static inline uint int_token(const char *str,uint length) } /* - yylex remember the following states from the following yylex() + MYSQLlex remember the following states from the following MYSQLlex() - MY_LEX_EOQ Found end of query - MY_LEX_OPERATOR_OR_IDENT Last state was an ident, text or number (which can't be followed by a signed number) */ -int yylex(void *arg, void *yythd) +int MYSQLlex(void *arg, void *yythd) { reg1 uchar c; int tokval, result_state; |