Commit 50914ba7 authored by unknown's avatar unknown
Browse files

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/M50/mysql-5.0


include/my_sys.h:
  Auto merged
parents 8ab73b4c d8222c03

mysys/hash.c

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

sql/net_serv.cc

+1 −1

File changed.

Contains only whitespace changes.