HAYASHI Kentaro
null+****@clear*****
Wed Jul 31 17:43:14 JST 2013
HAYASHI Kentaro 2013-07-31 17:43:14 +0900 (Wed, 31 Jul 2013) New Revision: 51a45328ea20c983039889dc887b581d980e4d11 https://github.com/mroonga/mroonga/commit/51a45328ea20c983039889dc887b581d980e4d11 Message: mariadb: fix crash bug in mrn_init() on Windows The symbol name mismatch about argument of GetProcAddress causes NULL pointer exception in this case. Modified files: ha_mroonga.cpp Modified: ha_mroonga.cpp (+2 -2) =================================================================== --- ha_mroonga.cpp 2013-07-30 18:04:39 +0900 (3804435) +++ ha_mroonga.cpp 2013-07-31 17:43:14 +0900 (bcbdb3e) @@ -1779,7 +1779,7 @@ 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 @@ -1787,7 +1787,7 @@ static int mrn_init(void *p) "?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 -------------- next part -------------- HTML����������������������������...ダウンロード
