summaryrefslogtreecommitdiff
path: root/innobase/pars
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-05-09 23:02:36 +0300
committerunknown <monty@donna.mysql.fi>2001-05-09 23:02:36 +0300
commit0fece375f2ae4bb173357609b46924a997113593 (patch)
tree288f7cc7d0ca91ae340b7a568971bb02d8eb798d /innobase/pars
parent2321260ff07b0a90e3f84c756370a328ac17f990 (diff)
downloadmariadb-git-0fece375f2ae4bb173357609b46924a997113593.tar.gz
Applied patches for BDB tables
Fixes to InnoDB to compile on Windows Fix for temporary InnoDB tables Fixed bug in REPLACE() Fixed sub char keys for InnoDB Docs/manual.texi: Changelog + update of table types bdb/include/log.h: Patch from Sleepycat bdb/log/log.c: Patch from Sleepycat bdb/log/log_rec.c: Patch from Sleepycat client/mysqladmin.c: Cleanup innobase/include/univ.i: Fix for compilation on Windows innobase/os/os0file.c: cleanup innobase/pars/pars0grm.y: Fix for compilation on Windows mysql-test/r/innodb.result: New test case mysql-test/t/innodb.test: New test case sql/ha_innobase.cc: cleanup sql/ha_innobase.h: Fix for prefix keys sql/handler.h: Fix for temporary Innodb tables sql/item_strfunc.cc: Fixed bug in REPLACE() sql/lock.cc: Fix for temporary Innodb tables sql/mysqld.cc: Added --skip-stack-trace sql/share/english/errmsg.txt: Better error messages sql/sql_base.cc: Fix for temporary Innodb tables sql/sql_select.cc: Fix for temporary Innodb tables sql/sql_table.cc: Fixed sub char keys for InnoDB sql/table.h: Fix for temporary Innodb tables
Diffstat (limited to 'innobase/pars')
-rw-r--r--innobase/pars/pars0grm.y3
1 files changed, 2 insertions, 1 deletions
diff --git a/innobase/pars/pars0grm.y b/innobase/pars/pars0grm.y
index 681454f1d72..ae8c5ab91ec 100644
--- a/innobase/pars/pars0grm.y
+++ b/innobase/pars/pars0grm.y
@@ -10,9 +10,10 @@ Created 12/14/1997 Heikki Tuuri
/* 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"