mariadb: fix crash bug in mrn_init() on Windows

The symbol name mismatch about argument of GetProcAddress causes NULL pointer exception in this case.
mroonga · Jul 31, 2013 · 51a4532 · 51a4532
1 parent 1502fe6
commit 51a4532
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
@@ -1779,15 +1779,15 @@ static int mrn_init(void *p)
 #ifdef _WIN32
   HMODULE current_module = GetModuleHandle(NULL);
   mrn_binlog_filter =
-#if MYSQL_VERSION_ID >= 50600 && !defined(MRN_MARIADB_P)
+#if MYSQL_VERSION_ID >= 50600
     *((Rpl_filter **) GetProcAddress(current_module,
       "?binlog_filter@@3PEAVRpl_filter@@EA"));
 #else
     *((Rpl_filter **) GetProcAddress(current_module,
       "?binlog_filter@@3PAVRpl_filter@@A"));
 #endif
   mrn_my_tz_UTC =
-#if MYSQL_VERSION_ID >= 50600 && !defined(MRN_MARIADB_P)
+#if MYSQL_VERSION_ID >= 50600
     *((Time_zone **) GetProcAddress(current_module,
       "?my_tz_UTC@@3PEAVTime_zone@@EA"));
 #else