diff options
| author | monty@mysql.com <> | 2004-06-25 20:13:05 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-06-25 20:13:05 +0300 |
| commit | b1d08ba2b423bd6d88aaa0efaba1807f7e792a47 (patch) | |
| tree | 983268d5f30394d4fa4ffdd75cd095f6227e5170 /mysys | |
| parent | f6765146c1b97bbb71f79adbd275dc2b6ca79333 (diff) | |
| parent | c3eb93604085134940f89c7d12366d431ced9ea9 (diff) | |
| download | mariadb-git-b1d08ba2b423bd6d88aaa0efaba1807f7e792a47.tar.gz | |
Merge with 4.0 to get the latest bug patches to 4.1
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/hash.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/hash.c b/mysys/hash.c index b7be41a9058..11cbbd6b898 100644 --- a/mysys/hash.c +++ b/mysys/hash.c @@ -122,7 +122,8 @@ static uint hash_rec_mask(HASH *hash,HASH_LINK *pos,uint buffmax, -#if !defined(__SUNPRO_C) && !defined(__USLC__) /* broken compilers */ +/* for compilers which can not handle inline */ +#if !defined(__SUNPRO_C) && !defined(__USLC__) && !defined(__sgi) inline #endif unsigned int rec_hashnr(HASH *hash,const byte *record) |