Kouhei Sutou
null+****@clear*****
Sun Jun 21 23:06:22 JST 2015
Kouhei Sutou 2015-06-21 23:06:22 +0900 (Sun, 21 Jun 2015) New Revision: 2dc78eb3e682ced6df840863e94618d40f1ba04f https://github.com/mroonga/mroonga/commit/2dc78eb3e682ced6df840863e94618d40f1ba04f Message: Remove needless old MariaDB check Modified files: ha_mroonga.hpp Modified: ha_mroonga.hpp (+3 -5) =================================================================== --- ha_mroonga.hpp 2015-06-21 22:59:39 +0900 (7c1818d) +++ ha_mroonga.hpp 2015-06-21 23:06:22 +0900 (ed221cd) @@ -37,8 +37,7 @@ extern "C" { # define MRN_HANDLER_HAVE_FINAL_ADD_INDEX 1 #endif -#if (MYSQL_VERSION_ID >= 50603) || \ - (defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 50209) +#if (MYSQL_VERSION_ID >= 50603) || defined(MRN_MARIADB_P) # define MRN_HANDLER_HAVE_HA_RND_NEXT 1 # define MRN_HANDLER_HAVE_HA_RND_POS 1 # define MRN_HANDLER_HAVE_HA_INDEX_READ_MAP 1 @@ -50,8 +49,7 @@ extern "C" { # define MRN_HANDLER_HAVE_HA_INDEX_NEXT_SAME 1 #endif -#if (MYSQL_VERSION_ID >= 50604) || \ - (defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 50302) +#if (MYSQL_VERSION_ID >= 50604) || defined(MRN_MARIADB_P) # define MRN_HANDLER_HAVE_HA_CLOSE 1 # define MRN_HANDLER_HAVE_MULTI_RANGE_READ 1 #endif @@ -71,7 +69,7 @@ extern "C" { # endif #endif -#if (defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 50302) +#ifdef MRN_MARIADB_P # define MRN_HANDLER_HAVE_MULTI_RANGE_READ_INFO_KEY_PARTS #endif -------------- next part -------------- HTML����������������������������...Download