diff options
| author | unknown <joerg@mysql.com> | 2005-03-08 17:24:07 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-03-08 17:24:07 +0100 |
| commit | d8222c03c0c0ab744b83568af17e98d170bbfc7d (patch) | |
| tree | ae085150871d883992b54e6041c8a27dd7c6171c /mysys/hash.c | |
| parent | 05dfca24c4720bcc334d27a2e88ddfe9dccf14a6 (diff) | |
| parent | 395618a65111301d76373dbd84763b91a02b993a (diff) | |
| download | mariadb-git-d8222c03c0c0ab744b83568af17e98d170bbfc7d.tar.gz | |
Merge changes.
Build-tools/Do-compile:
Change already present in 5.0
configure.in:
Do not propagate a 4.0 version number to the 5.0 tree.
include/my_sys.h:
Change already present in 5.0.
mysys/hash.c:
For Sun compilers, 'static inline' is ok.
mysys/my_bitmap.c:
Change already present in 5.0
sql/item_strfunc.cc:
Change already present in 5.0
sql/net_serv.cc:
Change already present in 5.0
Diffstat (limited to 'mysys/hash.c')
| -rw-r--r-- | mysys/hash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/hash.c b/mysys/hash.c index 9632f9773fd..fe27b5fcb6d 100644 --- a/mysys/hash.c +++ b/mysys/hash.c @@ -175,7 +175,7 @@ static uint hash_rec_mask(HASH *hash,HASH_LINK *pos,uint buffmax, /* for compilers which can not handle inline */ static -#if !defined(__SUNPRO_C) && !defined(__USLC__) && !defined(__sgi) +#if !defined(__USLC__) && !defined(__sgi) inline #endif unsigned int rec_hashnr(HASH *hash,const byte *record) |