From: Date: August 21 2006 2:52pm
Subject: bk commit into 5.0 tree (msvensson:1.2246) BUG#19810
List-Archive: http://lists.mysql.com/commits/10669
X-Bug: 19810
Message-Id: <20060821125204.7615386DE70@localhost.localdomain>

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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@stripped, 2006-08-21 14:51:59+02:00, msvensson@neptunus.(none) +1 -0
  Bug#19810  	Bundled YASSL in libmysqlclient conflicts with OpenSSL
   - Rename yaSSL version of 'SSL_peek' to 'yaSSL_peek' by using a macro

  extra/yassl/include/openssl/prefix_ssl.h@stripped, 2006-08-21 14:51:57+02:00, msvensson@neptunus.(none) +1 -0
    Rename yaSSL version of SSL_peek to yaSSL_peek

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.1/extra/yassl/include/openssl/prefix_ssl.h	2006-08-21 14:52:04 +02:00
+++ 1.2/extra/yassl/include/openssl/prefix_ssl.h	2006-08-21 14:52:04 +02:00
@@ -150,3 +150,4 @@
 #define MD5_Init yaMD5_Init
 #define MD5_Update yaMD5_Update
 #define MD5_Final yaMD5_Final
+#define SSL_peek yaSSL_peek