bk commit into 5.0 tree (msvensson:1.2102)

[msvensson]

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
  1.2102 06/04/27 22:21:23 msvensson@shellback.(none) +2 -0
  Fix merge error

  extra/yassl/taocrypt/src/integer.cpp
    1.21 06/04/27 22:21:11 msvensson@shellback.(none) +0 -8
    Fix merge error, duplicate function definition

  extra/yassl/src/yassl_int.cpp
    1.14 06/04/27 22:21:11 msvensson@shellback.(none) +1 -1
    Fix merge error, missing {

# 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

--- 1.13/extra/yassl/src/yassl_int.cpp	2006-04-27 17:35:24 +02:00
+++ 1.14/extra/yassl/src/yassl_int.cpp	2006-04-27 22:21:11 +02:00
@@ -1375,7 +1375,7 @@
 
 static sslFactory* sslFactoryInstance = 0;
 
-sslFactory& GetSSL_Factory()
+sslFactory& GetSSL_Factory(){
     if (!sslFactoryInstance)
         sslFactoryInstance = NEW_YS sslFactory;
     return *sslFactoryInstance;

--- 1.20/extra/yassl/taocrypt/src/integer.cpp	2006-04-27 17:35:24 +02:00
+++ 1.21/extra/yassl/taocrypt/src/integer.cpp	2006-04-27 22:21:11 +02:00
@@ -2738,14 +2738,6 @@
 }
 
 
-// Clean up static singleton holders, not a leak, but helpful to have gone
-// when checking for leaks
-void CleanUp()
-{
-    tcDelete(one);
-    tcDelete(zero);
-}
-
 Integer::Integer(RandomNumberGenerator& rng, const Integer& min,
                  const Integer& max)
 {