Commit 967256eb authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-clean 

into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/ps_6bdb.result:
  Auto merged
include/my_global.h:
  SCCS merged
parents 9fc80208 f8f95d1c

include/my_global.h

+0 −6
Original line number Diff line number Diff line
@@ -285,13 +285,7 @@ C_MODE_END 
# endif

#endif /* TIME_WITH_SYS_TIME */

#ifdef HAVE_UNISTD_H

#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) && !defined(__APPLE__)

#define crypt unistd_crypt

#endif

#include <unistd.h>

#ifdef HAVE_OPENSSL

#undef crypt

#endif

#endif

#if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA)

#undef HAVE_ALLOCA