Commit 8ca171d9 authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/bug18195/my50-bug18195 

into  shellback.(none):/home/msvensson/mysql/bug18195/my51-bug18195


include/config-win.h:
  Auto merged
parents 9865f74f bff2fc22

include/config-win.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */