diff options
| author | unknown <brian@zim.(none)> | 2006-03-09 10:39:40 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-03-09 10:39:40 -0800 |
| commit | 4f3a18d5b5dbe4db464cc489f739c9b84c02fbf0 (patch) | |
| tree | 47df89ae26421d49c6b6ce4cb0f8f52e9aa793f9 /sql/sql_lex.h | |
| parent | fe0b818f9a07a9e56053c8addf53796e106e6c81 (diff) | |
| parent | 85d705b651cf9057f2d687294044f173880675c3 (diff) | |
| download | mariadb-git-4f3a18d5b5dbe4db464cc489f739c9b84c02fbf0.tar.gz | |
Merge zim.(none):/home/brian/mysql/mysql-5.0
into zim.(none):/home/brian/mysql/mysql-5.1-new
configure.in:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 0d272fc7989..c98255e7ecc 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -41,8 +41,12 @@ class Event_timed; #define LEX_YYSTYPE void * #else #include "lex_symbol.h" +#if MYSQL_LEX #include "sql_yacc.h" #define LEX_YYSTYPE YYSTYPE * +#else +#define LEX_YYSTYPE void * +#endif #endif #endif |