Commit 38789100 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/M41/mysql-4.1
parents e23e81f7 3efe8a84

include/my_sys.h

+2 −0
Original line number Diff line number Diff line
@@ -189,11 +189,13 @@ void __CDECL hfree(void *ptr); 
#endif

#endif /* MSDOS */



#ifndef errno				/* did we already get it? */

#ifdef HAVE_ERRNO_AS_DEFINE

#include <errno.h>			/* errno is a define */

#else

extern int errno;			/* declare errno */

#endif

#endif					/* #ifndef errno */

extern const char ** NEAR my_errmsg[];

extern char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE];

extern char *home_dir;			/* Home directory for user */

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)

mysys/my_bitmap.c

+2 −4
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include <my_bitmap.h>

#include <m_string.h>





static inline void bitmap_lock(MY_BITMAP* map)

{

#ifdef THREAD
@@ -46,7 +45,6 @@ static inline void bitmap_lock(MY_BITMAP *map) 
#endif

}





static inline void bitmap_unlock(MY_BITMAP* map)

{

#ifdef THREAD

sql/net_serv.cc

+1 −1

File changed.

Contains only whitespace changes.