summaryrefslogtreecommitdiff
path: root/innobase/pars/lexyy.c
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2002-10-25 21:15:52 +0000
committerunknown <serg@serg.mysql.com>2002-10-25 21:15:52 +0000
commitf5563ddad40e8ab84d457b0e9960ddfdc7faec99 (patch)
tree30c13439b168df68d4884a7403a173a8970cc56e /innobase/pars/lexyy.c
parent68a5932ab2b5e39858fa03934cbbe5c90042497e (diff)
parent43abd169b081479cb6ce1ad510a2620a2bb50db8 (diff)
downloadmariadb-git-f5563ddad40e8ab84d457b0e9960ddfdc7faec99.tar.gz
merged
BitKeeper/etc/gone: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-skipkeys~53ffbfa7d2fa9fb: Delete: BitKeeper/etc/skipkeys BitKeeper/etc/skipkeys: Rename: BitKeeper/deleted/.del-skipkeys~f623848ba4db5c3 -> BitKeeper/etc/skipkeys Build-tools/Do-compile: Auto merged Docs/manual.texi: Auto merged innobase/pars/lexyy.c: Auto merged innobase/pars/pars0grm.c: Auto merged mysys/my_init.c: Auto merged scripts/mysqlhotcopy.sh: Auto merged sql/nt_servc.cc: Auto merged sql/nt_servc.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_table.cc: Auto merged mysql-test/t/bdb-crash.test: Auto merged
Diffstat (limited to 'innobase/pars/lexyy.c')
-rw-r--r--innobase/pars/lexyy.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/innobase/pars/lexyy.c b/innobase/pars/lexyy.c
index f7edc9d195f..782fca35f66 100644
--- a/innobase/pars/lexyy.c
+++ b/innobase/pars/lexyy.c
@@ -4,6 +4,8 @@
* $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
*/
+#include "univ.i"
+
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
@@ -607,13 +609,18 @@ How to make the InnoDB parser and lexer C files:
6. Remove the #include of unistd.h from about line 2500 of lexyy.c
+7. Move #include <math.h> in pars0grm.c after #include "univ.i" to remove
+ a large file compilation error on AIX.
+
+8. Move #include "univ.i" in lexyy.c to the file start to remove a large
+ file compilation error on AIX.
+
These instructions seem to work at least with bison-1.28 and flex-2.5.4 on
Linux.
*******************************************************/
#line 36 "pars0lex.l"
#define YYSTYPE que_node_t*
-#include "univ.i"
#include "pars0pars.h"
#include "pars0grm.h"
#include "pars0sym.h"