diff options
author | unknown <msvensson@shellback.(none)> | 2006-03-16 09:34:47 +0100 |
---|---|---|
committer | unknown <msvensson@shellback.(none)> | 2006-03-16 09:34:47 +0100 |
commit | 8ca171d9bbcfe6be5d6deebd7498e6a1c6ecda43 (patch) | |
tree | c898f25740ce88363e74bde5db6a3d9a9b4ec83f /include | |
parent | 9865f74f173f85da93779f4a5c74affee2730219 (diff) | |
parent | bff2fc2210aa97d6ec5c94c787904d24afcc7aa6 (diff) | |
download | mariadb-git-8ca171d9bbcfe6be5d6deebd7498e6a1c6ecda43.tar.gz |
Merge shellback.(none):/home/msvensson/mysql/bug18195/my50-bug18195
into shellback.(none):/home/msvensson/mysql/bug18195/my51-bug18195
include/config-win.h:
Auto merged
Diffstat (limited to 'include')
-rw-r--r-- | include/config-win.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/config-win.h b/include/config-win.h index fb7aeb82e83..a7bce21b3a1 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -429,8 +429,8 @@ inline double ulonglong2double(ulonglong value) #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 */ |