Commit a397a194 authored by unknown's avatar unknown
Browse files

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)


innobase/include/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)
parent d33b968f

innobase/include/univ.i

+1 −1
Original line number Diff line number Diff line
@@ -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 */