Kouhei Sutou
null+****@clear*****
Sat May 16 17:55:23 JST 2015
Kouhei Sutou 2015-05-16 17:55:23 +0900 (Sat, 16 May 2015) New Revision: a69698c3b2a617c122bd1db0708d2e542f1d8e4f https://github.com/mroonga/mroonga/commit/a69698c3b2a617c122bd1db0708d2e542f1d8e4f Message: mariadb10.1: follow API change of ha_resolve_by_name() Modified files: mrn_table.cpp Modified: mrn_table.cpp (+11 -3) =================================================================== --- mrn_table.cpp 2015-05-16 17:52:17 +0900 (ebd3e7e) +++ mrn_table.cpp 2015-05-16 17:55:23 +0900 (1bb35d5) @@ -35,10 +35,18 @@ #include "mrn_variables.hpp" #include <mrn_lock.hpp> -#if MYSQL_VERSION_ID >= 50603 && !defined(MRN_MARIADB_P) -# define MRN_HA_RESOLVE_BY_NAME(name) ha_resolve_by_name(NULL, (name), TRUE) +#ifdef MRN_MARIADB_P +# if MYSQL_VERSION_ID >= 100100 +# define MRN_HA_RESOLVE_BY_NAME(name) ha_resolve_by_name(NULL, (name), TRUE) +# else +# define MRN_HA_RESOLVE_BY_NAME(name) ha_resolve_by_name(NULL, (name)) +# endif #else -# define MRN_HA_RESOLVE_BY_NAME(name) ha_resolve_by_name(NULL, (name)) +# if MYSQL_VERSION_ID >= 50603 +# define MRN_HA_RESOLVE_BY_NAME(name) ha_resolve_by_name(NULL, (name), TRUE) +# else +# define MRN_HA_RESOLVE_BY_NAME(name) ha_resolve_by_name(NULL, (name)) +# endif #endif #if MYSQL_VERSION_ID >= 50706 && !defined(MRN_MARIADB_P) -------------- next part -------------- HTML����������������������������...ダウンロード
