Kouhei Sutou
null+****@clear*****
Sun Mar 15 00:01:19 JST 2015
Kouhei Sutou 2015-03-15 00:01:19 +0900 (Sun, 15 Mar 2015) New Revision: 767675fbc12c688e36f28a33d0080e5404ecd8f8 https://github.com/mroonga/mroonga/commit/767675fbc12c688e36f28a33d0080e5404ecd8f8 Message: mysql57: follow handlerton::flush_logs API change Modified files: ha_mroonga.cpp ha_mroonga.hpp Modified: ha_mroonga.cpp (+4 -0) =================================================================== --- ha_mroonga.cpp 2015-03-14 23:58:06 +0900 (54eb219) +++ ha_mroonga.cpp 2015-03-15 00:01:19 +0900 (2a2788c) @@ -1145,7 +1145,11 @@ static int mrn_close_connection(handlerton *hton, THD *thd) DBUG_RETURN(0); } +#ifdef MRN_FLUSH_LOGS_HAVE_BINLOG_GROUP_FLUSH +static bool mrn_flush_logs(handlerton *hton, bool binlog_group_flush) +#else static bool mrn_flush_logs(handlerton *hton) +#endif { MRN_DBUG_ENTER_FUNCTION(); bool result = 0; Modified: ha_mroonga.hpp (+4 -0) =================================================================== --- ha_mroonga.hpp 2015-03-14 23:58:06 +0900 (9f2d373) +++ ha_mroonga.hpp 2015-03-15 00:01:19 +0900 (a8843fe) @@ -205,6 +205,10 @@ extern "C" { # define MRN_SUPPORT_PARTITION #endif +#if MYSQL_VERSION_ID >= 50706 && !defined(MRN_MARIADB_P) +# define MRN_FLUSH_LOGS_HAVE_BINLOG_GROUP_FLUSH +#endif + class ha_mroonga; /* structs */ -------------- next part -------------- HTML����������������������������...Download
