Commit 4f1685f6 authored by unknown's avatar unknown
Browse files

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

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

parents d15c7979 bff2fc22
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -413,8 +413,8 @@ inline double ulonglong2double(ulonglong value)
#define HAVE_SPATIAL 1
#define HAVE_RTREE_KEYS 1

/* #undef HAVE_OPENSSL */
/* #undef HAVE_YASSL */
#define HAVE_OPENSSL 1
#define HAVE_YASSL 1

/* Define charsets you want */
/* #undef HAVE_CHARSET_armscii8 */