summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-06-12 22:02:32 +0300
committerunknown <monty@hundin.mysql.fi>2001-06-12 22:02:32 +0300
commit063052811b2ec812b33c8756217c5f84c521fe23 (patch)
tree4f48f2eea0e9435491faf7b026b019d7693cfb59 /innobase
parent043c49aade6113bd01f564880854b0071a88d953 (diff)
downloadmariadb-git-063052811b2ec812b33c8756217c5f84c521fe23.tar.gz
Fixed changelog
configure.in: change version number back to avoid confusion innobase/include/univ.i: Fix for gcc 2.96
Diffstat (limited to 'innobase')
-rw-r--r--innobase/include/univ.i2
1 files changed, 2 insertions, 0 deletions
diff --git a/innobase/include/univ.i b/innobase/include/univ.i
index d29ca83b0fc..4c67f49d199 100644
--- a/innobase/include/univ.i
+++ b/innobase/include/univ.i
@@ -49,6 +49,8 @@ subdirectory of 'mysql'. */
/* Include the header file generated by GNU autoconf */
#include "../ib_config.h"
+#undef UNIV_INTEL_X86 /* Temporary fix for gcc 2.96 */
+
#ifdef HAVE_SCHED_H
#include <sched.h>
#endif