diff options
| author | unknown <monty@donna.mysql.fi> | 2001-05-12 01:01:27 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-05-12 01:01:27 +0300 |
| commit | 442e091f623f9f114e914001af2833ad9a7d675b (patch) | |
| tree | deefde80516b0236ca208cd83cda361d0007176d /innobase | |
| parent | c69f5dc37a8b510412d067f0b8b3f20c1559f72b (diff) | |
| parent | 6433cf75e744d6bb75f4daec1b3eeb353c4c6d8a (diff) | |
| download | mariadb-git-442e091f623f9f114e914001af2833ad9a7d675b.tar.gz | |
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/pars/pars0grm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/innobase/pars/pars0grm.c b/innobase/pars/pars0grm.c index 7f629a8fe4c..e06cba4e69d 100644 --- a/innobase/pars/pars0grm.c +++ b/innobase/pars/pars0grm.c @@ -95,9 +95,10 @@ /* The value of the semantic attribute is a pointer to a query tree node que_node_t */ #define YYSTYPE que_node_t* -#define alloca mem_alloc #include "univ.i" +#undef alloca +#define alloca mem_alloc #include <math.h> #include "pars0pars.h" #include "mem0mem.h" |