From: Date: June 8 2005 6:07pm
Subject: bk commit into 4.0 tree (svoj:1.2116) BUG#11150
List-Archive: http://lists.mysql.com/internals/25762
X-Bug: 11150
Message-Id: <20050608160729.537CA33C4@svoj.pils.ru>

Below is the list of changes that have just been committed into a local
4.0 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2116 05/06/08 21:07:25 svoj@stripped +1 -0
  Fix for
  BUG#10675 - MySQL fails to build with --openssl on Mac OS X 10.4
  BUG#11150 - HP-UX yaSSL/OpenSSL configure/header problem
  Remove obsolete code.

  include/my_global.h
    1.72 05/06/08 21:07:23 svoj@stripped +0 -6
    Obsolete code removed. OpenSSL doesn't have crypt anymore (it was dropped in ~2003).
    This patch fixes compilation failures with both OpenSSL and yaSSL on systems where
    crypt was defined in unistd.h.
    Conclusion is we do not use OpenSSL's crypt unless it wasn't defined in
    unistd.h/crypt.h and it was defined in old OpenSSL.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	svoj
# Host:	svoj.pils.ru
# Root:	/var/tmp/sslbug/mysql-4.0

--- 1.71/include/my_global.h	2005-06-03 18:05:06 +05:00
+++ 1.72/include/my_global.h	2005-06-08 21:07:23 +05:00
@@ -248,13 +248,7 @@
 # endif
 #endif /* TIME_WITH_SYS_TIME */
 #ifdef HAVE_UNISTD_H
-#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)
-#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