Kouhei Sutou
null+****@clear*****
Wed Apr 16 22:27:42 JST 2014
Kouhei Sutou 2014-04-16 22:27:42 +0900 (Wed, 16 Apr 2014) New Revision: 28ace4070630020c153fda6094c956739a82424d https://github.com/mroonga/mroonga/commit/28ace4070630020c153fda6094c956739a82424d Message: Support MySQL 5.6.17 Modified files: ha_mroonga.cpp ha_mroonga.hpp Modified: ha_mroonga.cpp (+5 -0) =================================================================== --- ha_mroonga.cpp 2014-04-16 22:01:58 +0900 (7fe8895) +++ ha_mroonga.cpp 2014-04-16 22:27:42 +0900 (c99eceb) @@ -462,6 +462,11 @@ static const char *mrn_inspect_extra_function(enum ha_extra_function operation) inspected = "HA_EXTRA_EXPORT"; break; #endif +#ifdef MRN_HAVE_HA_EXTRA_SECONDARY_SORT_ROWID + case HA_EXTRA_SECONDARY_SORT_ROWID: + inspected = "HA_EXTRA_SECONDARY_SORT_ROWID"; + break; +#endif #ifdef MRN_HAVE_HA_EXTRA_DETACH_CHILD case HA_EXTRA_DETACH_CHILD: inspected = "HA_EXTRA_DETACH_CHILD"; Modified: ha_mroonga.hpp (+4 -0) =================================================================== --- ha_mroonga.hpp 2014-04-16 22:01:58 +0900 (d200bca) +++ ha_mroonga.hpp 2014-04-16 22:27:42 +0900 (abe67be) @@ -126,6 +126,10 @@ extern "C" { # define MRN_HAVE_HA_EXTRA_EXPORT #endif +#if MYSQL_VERSION_ID >= 50617 && !defined(MRN_MARIADB_P) +# define MRN_HAVE_HA_EXTRA_SECONDARY_SORT_ROWID +#endif + #if MYSQL_VERSION_ID >= 50604 && !defined(MRN_MARIADB_P) # define MRN_TIMESTAMP_USE_TIMEVAL #elif defined(MRN_MARIADB_P) -------------- next part -------------- HTML����������������������������...Download