Kouhei Sutou 2019-05-18 23:22:14 +0900 (Sat, 18 May 2019) Revision: 710432e63c300371ab79a52d0d18ba6ce503e822 https://github.com/mroonga/mroonga/commit/710432e63c300371ab79a52d0d18ba6ce503e822 Message: mariadb10.2: add support for MariaDB 10.2.24 Modified files: ha_mroonga.hpp Modified: ha_mroonga.hpp (+12 -10) =================================================================== --- ha_mroonga.hpp 2019-05-18 23:16:08 +0900 (450113ef) +++ ha_mroonga.hpp 2019-05-18 23:22:14 +0900 (83e02ef3) @@ -122,11 +122,19 @@ extern "C" { # define MRN_HAVE_HA_EXTRA_PREPARE_FOR_FORCED_CLOSE #endif +#if (!defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 80002) || \ + (defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100224) +# define MRN_HAVE_HA_EXTRA_BEGIN_ALTER_COPY +# define MRN_HAVE_HA_EXTRA_END_ALTER_COPY +#endif + #if (!defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 80002) -#define MRN_HAVE_HA_EXTRA_SKIP_SERIALIZABLE_DD_VIEW -#define MRN_HAVE_HA_EXTRA_BEGIN_ALTER_COPY -#define MRN_HAVE_HA_EXTRA_END_ALTER_COPY -#define MRN_HAVE_HA_EXTRA_NO_AUTOINC_LOCKING +# define MRN_HAVE_HA_EXTRA_SKIP_SERIALIZABLE_DD_VIEW +# define MRN_HAVE_HA_EXTRA_NO_AUTOINC_LOCKING +#endif + +#if (defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100224) +# define MRN_HAVE_HA_EXTRA_FAKE_START_STMT #endif #if MYSQL_VERSION_ID >= 50607 && \ @@ -146,12 +154,6 @@ extern "C" { # define MRN_HAVE_HA_EXTRA_STARTING_ORDERED_INDEX_SCAN #endif -#if MYSQL_VERSION_ID >= 100306 && defined(MRN_MARIADB_P) -# define MRN_HAVE_HA_EXTRA_BEGIN_ALTER_COPY -# define MRN_HAVE_HA_EXTRA_END_ALTER_COPY -# define MRN_HAVE_HA_EXTRA_FAKE_START_STMT -#endif - #if MYSQL_VERSION_ID >= 50604 && !defined(MRN_MARIADB_P) # define MRN_TIMESTAMP_USE_TIMEVAL #elif defined(MRN_MARIADB_P) -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20190518/55f3b12b/attachment-0001.html>
