diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-06-12 22:02:51 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-06-12 22:02:51 +0300 |
| commit | 864a7b7275e0475f18c81fec62d41f940829bf36 (patch) | |
| tree | 9c39feec94306f695f8249dc61bfb10656a9c435 /innobase/include | |
| parent | 125f86ce7540b9b0d59ca26f5c6b862c3003a5f3 (diff) | |
| parent | 063052811b2ec812b33c8756217c5f84c521fe23 (diff) | |
| download | mariadb-git-864a7b7275e0475f18c81fec62d41f940829bf36.tar.gz | |
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
innobase/include/univ.i:
Auto merged
Diffstat (limited to 'innobase/include')
| -rw-r--r-- | innobase/include/univ.i | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/innobase/include/univ.i b/innobase/include/univ.i index 9ded084d044..a47c3ae77c9 100644 --- a/innobase/include/univ.i +++ b/innobase/include/univ.i @@ -51,6 +51,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 |