Kouhei Sutou
null+****@clear*****
Sat Apr 20 18:03:37 JST 2013
Kouhei Sutou 2013-04-20 18:03:37 +0900 (Sat, 20 Apr 2013) New Revision: cbc29f004a7980fc8e8777dafb1e890778e380eb https://github.com/mroonga/mroonga/commit/cbc29f004a7980fc8e8777dafb1e890778e380eb Message: Support MySQL 5.6.11 Modified files: ha_mroonga.cpp ha_mroonga.hpp Modified: ha_mroonga.cpp (+4 -0) =================================================================== --- ha_mroonga.cpp 2013-04-20 18:00:20 +0900 (99a4560) +++ ha_mroonga.cpp 2013-04-20 18:03:37 +0900 (c071b02) @@ -7150,7 +7150,11 @@ int ha_mroonga::wrapper_index_read_last_map(uchar *buf, const uchar *key, MRN_SET_WRAP_TABLE_KEY(this, table); if (fulltext_searching) set_pk_bitmap(); +# ifdef MRN_HANDLER_HAVE_HA_INDEX_READ_LAST_MAP + error = wrap_handler->ha_index_read_last_map(buf, key, keypart_map); +# else error = wrap_handler->index_read_last_map(buf, key, keypart_map); +# endif MRN_SET_BASE_SHARE_KEY(share, table->s); MRN_SET_BASE_TABLE_KEY(this, table); DBUG_RETURN(error); Modified: ha_mroonga.hpp (+3 -0) =================================================================== --- ha_mroonga.hpp 2013-04-20 18:00:20 +0900 (2e39b2a) +++ ha_mroonga.hpp 2013-04-20 18:03:37 +0900 (e5b86c3) @@ -73,6 +73,9 @@ extern "C" { #ifndef MRN_MARIADB_P # define MRN_HANDLER_HAVE_INDEX_READ_LAST_MAP +# if MYSQL_VERSION_ID >= 50611 +# define MRN_HANDLER_HAVE_HA_INDEX_READ_LAST_MAP +# endif #endif #if (defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 50302) -------------- next part -------------- HTML����������������������������...Descargar