Below is the list of changes that have just been committed into a local
4.1 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/in...urce-tree.html

ChangeSet
1.2325 05/06/08 21:40:58 svoj (AT) mysql (DOT) com +1 -0
Merge mysql.com:/var/tmp/sslbug/mysql-4.0
into mysql.com:/var/tmp/sslbug/mysql-4.1

include/my_global.h
1.94 05/06/08 21:40:57 svoj (AT) mysql (DOT) com +0 -0
Auto merged

# 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.1/RESYNC

--- 1.93/include/my_global.h 2005-06-05 22:38:38 +05:00
+++ 1.94/include/my_global.h 2005-06-08 21:40:57 +05:00
@@ -264,13 +264,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

--
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe: http://lists.mysql.com/internals?uns...ie.nctu.edu.tw