bk commit into 5.0 tree (msvensson:1.2105)

[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.2105 06/04/28 08:33:42 msvensson@neptunus.(none) +3 -0
  Merge bk-internal:/home/bk/mysql-5.0-maint
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

  extra/yassl/taocrypt/src/template_instnt.cpp
    1.9 06/04/28 08:33:36 msvensson@neptunus.(none) +0 -0
    Auto merged

  extra/yassl/src/template_instnt.cpp
    1.7 06/04/28 08:33:36 msvensson@neptunus.(none) +0 -0
    Auto merged

  client/mysql.cc
    1.203 06/04/28 08:33:36 msvensson@neptunus.(none) +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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint/RESYNC

--- 1.202/client/mysql.cc	2006-04-27 17:20:40 +02:00
+++ 1.203/client/mysql.cc	2006-04-28 08:33:36 +02:00
@@ -3118,6 +3118,8 @@
   if (opt_use_ssl)
     mysql_ssl_set(&mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,
 		  opt_ssl_capath, opt_ssl_cipher);
+  mysql_options(&mysql,MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
+                (char*)&opt_ssl_verify_server_cert);
 #endif
   if (opt_protocol)
     mysql_options(&mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);

--- 1.6/extra/yassl/src/template_instnt.cpp	2006-04-27 17:20:40 +02:00
+++ 1.7/extra/yassl/src/template_instnt.cpp	2006-04-28 08:33:36 +02:00
@@ -31,7 +31,6 @@
 #include "hmac.hpp"
 #include "md5.hpp"
 #include "sha.hpp"
-#include "ripemd.hpp"
 #include "openssl/ssl.h"
 
 #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION

--- 1.8/extra/yassl/taocrypt/src/template_instnt.cpp	2006-04-27 17:20:41 +02:00
+++ 1.9/extra/yassl/taocrypt/src/template_instnt.cpp	2006-04-28 08:33:36 +02:00
@@ -30,11 +30,11 @@
 #include "sha.hpp"
 #include "md5.hpp"
 #include "hmac.hpp"
-#include "ripemd.hpp"
 #include "pwdbased.hpp"
 #include "algebra.hpp"
 #include "vector.hpp"
 #include "hash.hpp"
+#include "ripemd.hpp"
 
 #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
 namespace TaoCrypt {