List:Commits« Previous MessageNext Message »
From:msvensson Date:August 31 2006 1:16pm
Subject:bk commit into 5.0 tree (msvensson:1.2262) BUG#21930
View as plain text  
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-31 15:16:44+02:00, msvensson@shellback.(none) +1 -0
  Bug#21930 libmysqlclient defines BN_bin2bn which belongs to OpenSSL! Breaks other apps!
   - Don't add the signatures for CRYPTO_* when compiling yaSSL for MySQL

  extra/yassl/taocrypt/src/misc.cpp@stripped, 2006-08-31 15:16:41+02:00, msvensson@shellback.(none) +2 -1
    No need to include the CRYPTO_* when compiling yaSSL for MySQL

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

--- 1.14/extra/yassl/taocrypt/src/misc.cpp	2006-08-31 15:16:50 +02:00
+++ 1.15/extra/yassl/taocrypt/src/misc.cpp	2006-08-31 15:16:50 +02:00
@@ -29,7 +29,7 @@
 #include "runtime.hpp"
 #include "misc.hpp"
 
-
+#if !defined(YASSL_MYSQL_COMPATIBLE)
 extern "C" {
 
     // for libcurl configure test, these are the signatures they use
@@ -37,6 +37,7 @@
     char CRYPTO_lock() { return 0;}
     char CRYPTO_add_lock() { return 0;}
 }  // extern "C"
+#endif
 
 #ifdef YASSL_PURE_C
 
Thread
bk commit into 5.0 tree (msvensson:1.2262) BUG#21930msvensson31 Aug