bk commit into 5.1 tree (msvensson:1.2322)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 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-09-27 14:38:25+02:00, msvensson@neptunus.(none) +2 -0
  Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
  into  neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
  MERGE: 1.1810.2120.2

  extra/yassl/include/openssl/ssl.h@stripped, 2006-09-27 14:38:21+02:00,
msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.14.1.3

  extra/yassl/src/template_instnt.cpp@stripped, 2006-09-27 14:38:21+02:00,
msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.10.1.3

# 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/yassl_import/my51-yassl_import/RESYNC

--- 1.17/extra/yassl/include/openssl/ssl.h	2006-09-27 14:38:31 +02:00
+++ 1.18/extra/yassl/include/openssl/ssl.h	2006-09-27 14:38:31 +02:00
@@ -41,7 +41,7 @@
 #include "rsa.h"
 
 
-#define YASSL_VERSION "1.4.2"
+#define YASSL_VERSION "1.4.3"
 
 
 #if defined(__cplusplus)

--- 1.13/extra/yassl/src/template_instnt.cpp	2006-09-27 14:38:31 +02:00
+++ 1.14/extra/yassl/src/template_instnt.cpp	2006-09-27 14:38:31 +02:00
@@ -109,6 +109,7 @@
 
 template int min<int>(int, int);
 template unsigned int min<unsigned int>(unsigned int, unsigned int);
+template unsigned long min<unsigned long>(unsigned long, unsigned long);
 }
 
 #endif // HAVE_EXPLICIT_TEMPLATE_INSTANTIATION