Commit b092f7da authored by unknown's avatar unknown

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

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

parents 902449b5 8ca171d9
...@@ -429,8 +429,8 @@ inline double ulonglong2double(ulonglong value) ...@@ -429,8 +429,8 @@ inline double ulonglong2double(ulonglong value)
#define HAVE_RTREE_KEYS 1 #define HAVE_RTREE_KEYS 1
#define HAVE_ROW_BASED_REPLICATION 1 #define HAVE_ROW_BASED_REPLICATION 1
/* #undef HAVE_OPENSSL */ #define HAVE_OPENSSL 1
/* #undef HAVE_YASSL */ #define HAVE_YASSL 1
/* Define charsets you want */ /* Define charsets you want */
/* #undef HAVE_CHARSET_armscii8 */ /* #undef HAVE_CHARSET_armscii8 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment