null+****@clear*****
null+****@clear*****
2011年 10月 31日 (月) 23:32:28 JST
Kouhei Sutou 2011-10-31 14:32:28 +0000 (Mon, 31 Oct 2011) New Revision: dcf21e1b4990df073e484fe29a50dd51c051235c Log: [mariadb] disable index_read_last_map(). refs #1152 Modified files: ha_mroonga.cc ha_mroonga.h Modified: ha_mroonga.cc (+2 -0) =================================================================== --- ha_mroonga.cc 2011-10-31 14:27:11 +0000 (4312c0a) +++ ha_mroonga.cc 2011-10-31 14:32:28 +0000 (e304e19) @@ -4576,6 +4576,7 @@ int ha_mroonga::index_read_map(uchar *buf, const uchar *key, DBUG_RETURN(error); } +#ifdef MRN_HANDLER_HAVE_INDEX_READ_LAST_MAP int ha_mroonga::wrapper_index_read_last_map(uchar *buf, const uchar *key, key_part_map keypart_map) { @@ -4662,6 +4663,7 @@ int ha_mroonga::index_read_last_map(uchar *buf, const uchar *key, } DBUG_RETURN(error); } +#endif int ha_mroonga::wrapper_index_next(uchar *buf) { Modified: ha_mroonga.h (+9 -1) =================================================================== --- ha_mroonga.h 2011-10-31 14:27:11 +0000 (41254e9) +++ ha_mroonga.h 2011-10-31 14:32:28 +0000 (c3b2215) @@ -67,6 +67,10 @@ extern "C" { # define MRN_HANDLER_HAVE_HA_INPLACE_INDEX_CHANGE #endif +#ifndef MRN_MARIADB_P +# define MRN_HANDLER_HAVE_INDEX_READ_LAST_MAP +#endif + #if MYSQL_VERSION_ID < 50600 typedef Item COND; #endif @@ -75,7 +79,7 @@ extern "C" { typedef MYSQL_ERROR Sql_condition; #endif -#if !defined(MRN_MARIADB_P) +#ifndef MRN_MARIADB_P typedef char *range_id_t; #endif @@ -223,8 +227,10 @@ public: key_part_map keypart_map, enum ha_rkey_function find_flag); #endif +#ifdef MRN_HANDLER_HAVE_INDEX_READ_LAST_MAP int index_read_last_map(uchar *buf, const uchar *key, key_part_map keypart_map); +#endif #ifndef MRN_HANDLER_HAVE_HA_INDEX_NEXT int index_next(uchar *buf); #endif @@ -481,10 +487,12 @@ private: int storage_index_read_map(uchar *buf, const uchar *key, key_part_map keypart_map, enum ha_rkey_function find_flag); +#ifdef MRN_HANDLER_HAVE_INDEX_READ_LAST_MAP int wrapper_index_read_last_map(uchar *buf, const uchar *key, key_part_map keypart_map); int storage_index_read_last_map(uchar *buf, const uchar *key, key_part_map keypart_map); +#endif int wrapper_index_next(uchar *buf); int storage_index_next(uchar *buf); int wrapper_index_prev(uchar *buf);