Commit d8222c03 authored by unknown's avatar unknown
Browse files

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
parents 05dfca24 395618a6

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.