diff options
| author | heikki@hundin.mysql.fi <> | 2005-08-17 18:15:50 +0300 |
|---|---|---|
| committer | heikki@hundin.mysql.fi <> | 2005-08-17 18:15:50 +0300 |
| commit | de8058630db5f8abedebe99695c673912eb47390 (patch) | |
| tree | 722b14d7b46270f1416bd53574e66d7d3193ad42 /innobase/include | |
| parent | a55786ca70db8cea04d661b1185bd4879ab8daf7 (diff) | |
| download | mariadb-git-de8058630db5f8abedebe99695c673912eb47390.tar.gz | |
univ.i:
Do not use __builtin_expect etc. with the Intel ICC compiler, as the compiler crashed in btr0cur.c; the patch was submitted by Axel Schwenke (Bug #11510)
Diffstat (limited to 'innobase/include')
| -rw-r--r-- | innobase/include/univ.i | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/include/univ.i b/innobase/include/univ.i index 132ac9e18c5..6849dcd9c51 100644 --- a/innobase/include/univ.i +++ b/innobase/include/univ.i @@ -244,7 +244,7 @@ contains the sum of the following flag and the locally stored len. */ #define UNIV_EXTERN_STORAGE_FIELD (UNIV_SQL_NULL - UNIV_PAGE_SIZE) /* Some macros to improve branch prediction and reduce cache misses */ -#if defined(__GNUC__) && (__GNUC__ > 2) +#if defined(__GNUC__) && (__GNUC__ > 2) && ! defined(__INTEL_COMPILER) /* Tell the compiler that 'expr' probably evaluates to 'constant'. */ # define UNIV_EXPECT(expr,constant) __builtin_expect(expr, constant) /* Tell the compiler that a pointer is likely to be NULL */ |