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 | 235a7ffd109422e515767cf32de2201163a0c5df (patch) | |
| tree | 9c39feec94306f695f8249dc61bfb10656a9c435 /innobase | |
| parent | 61ffb8e9ba7e8fd541e406137f255f6f9cac358e (diff) | |
| parent | 573b6a6d731cf08d9866b6646063f2553687105f (diff) | |
| download | mariadb-git-235a7ffd109422e515767cf32de2201163a0c5df.tar.gz | |
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
innobase/include/univ.i:
Auto merged
Diffstat (limited to 'innobase')
| -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 |