diff options
| author | monty@donna.mysql.fi <> | 2001-05-12 01:01:27 +0300 |
|---|---|---|
| committer | monty@donna.mysql.fi <> | 2001-05-12 01:01:27 +0300 |
| commit | 10920d0be1cf7981c2bc2d003af59f3c7944cf1f (patch) | |
| tree | deefde80516b0236ca208cd83cda361d0007176d /innobase | |
| parent | 01f43d7370c385edda0bb92be6b85813d46057ce (diff) | |
| parent | 369ea3bb8e08531f2ca6492830e8d0384cbd79fc (diff) | |
| download | mariadb-git-10920d0be1cf7981c2bc2d003af59f3c7944cf1f.tar.gz | |
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
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" |