bk commit into 5.1 tree (msvensson:1.2154)

[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
  1.2154 06/03/16 09:34:47 msvensson@shellback.(none) +1 -0
  Merge shellback.(none):/home/msvensson/mysql/bug18195/my50-bug18195
  into  shellback.(none):/home/msvensson/mysql/bug18195/my51-bug18195

  include/config-win.h
    1.82 06/03/16 09:34:41 msvensson@shellback.(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:	shellback.(none)
# Root:	/home/msvensson/mysql/bug18195/my51-bug18195/RESYNC

--- 1.81/include/config-win.h	2006-02-28 22:46:20 +01:00
+++ 1.82/include/config-win.h	2006-03-16 09:34:41 +01:00
@@ -429,8 +429,8 @@
 #define HAVE_RTREE_KEYS 1
 #define HAVE_ROW_BASED_REPLICATION 1
 
-/* #undef HAVE_OPENSSL */
-/* #undef HAVE_YASSL */
+#define HAVE_OPENSSL 1
+#define HAVE_YASSL 1
 
 /* Define charsets you want */
 /* #undef HAVE_CHARSET_armscii8 */