diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-02-23 14:05:17 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-02-23 14:05:17 +0100 |
| commit | b28aba4a46dfc313e17ca9464bb78768895f6890 (patch) | |
| tree | 4585fc0b1d66b80754a7bb77f102c8e76af0ac4a /storage/innobase/include/univ.i | |
| parent | 48603e8a587c1c6dee891727351657ee95d04495 (diff) | |
| download | mariadb-git-b28aba4a46dfc313e17ca9464bb78768895f6890.tar.gz | |
Workaround for bug with gcc on Solaris using pthread_setschedprio
Improved data typing of server variables in InnoDB to avoid bugs on
Windows.
Workaround for bug in gcc assembler on 32-bit Mac OS X as well as
on Solaris.
Diffstat (limited to 'storage/innobase/include/univ.i')
| -rw-r--r-- | storage/innobase/include/univ.i | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index cdd364ee070..6415e3dc6b3 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -69,7 +69,14 @@ of the 32-bit x86 assembler in mutex operations. */ /* When on Solaris, gcc, and 32-bit disable inlining */ -# if defined(__GNUC__) && defined(UNIV_SOLARIS) && !defined(__x86_64__) +# if defined(__GNUC__) && defined(UNIV_SOLARIS) && defined(__i386__) +# undef UNIV_MUST_NOT_INLINE +# define UNIV_MUST_NOT_INLINE +# endif + +/* When on Mac OS X, gcc, and 32-bit x86 disable inlining */ + +# if defined(__GNUC__) && defined(__APPLE__) && defined (__MACH__) && defined(__i386__) # undef UNIV_MUST_NOT_INLINE # define UNIV_MUST_NOT_INLINE # endif |