Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:27:26 JST 2012
Kouhei Sutou 2011-08-12 10:17:40 +0900 (Fri, 12 Aug 2011) New Revision: 3c739e9c95ddbaa0987635593279b2a7cecb4fed https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed Log: [mysql-5.6] handler::nnd_next() is protected. refs #1046 Modified files: ha_mroonga.cc ha_mroonga.h Modified: ha_mroonga.cc (+4 -0) =================================================================== --- ha_mroonga.cc 2011-08-12 10:14:16 +0900 (d3d76ba) +++ ha_mroonga.cc 2011-08-12 10:17:40 +0900 (402845f) @@ -2526,7 +2526,11 @@ int ha_mroonga::wrapper_rnd_next(uchar *buf) MRN_SET_WRAP_TABLE_KEY(this, table); if (fulltext_searching) set_pk_bitmap(); +#ifdef MRN_HANDLER_RND_NEXT_IS_PUBLIC error = wrap_handler->rnd_next(buf); +#else + error = wrap_handler->ha_rnd_next(buf); +#endif MRN_SET_BASE_SHARE_KEY(share, table->s); MRN_SET_BASE_TABLE_KEY(this, table); DBUG_RETURN(error); Modified: ha_mroonga.h (+11 -0) =================================================================== --- ha_mroonga.h 2011-08-12 10:14:16 +0900 (393798e) +++ ha_mroonga.h 2011-08-12 10:17:40 +0900 (ccd9789) @@ -42,6 +42,10 @@ extern "C" { #endif #if MYSQL_VERSION_ID < 50600 +# define MRN_HANDLER_RND_NEXT_IS_PUBLIC 1 +#endif + +#if MYSQL_VERSION_ID < 50600 typedef Item COND; #endif @@ -153,7 +157,9 @@ public: int rnd_init(bool scan); // required int rnd_end(); +#ifdef MRN_HANDLER_RND_NEXT_IS_PUBLIC int rnd_next(uchar *buf); // required +#endif int rnd_pos(uchar *buf, uchar *pos); // required void position(const uchar *record); // required int extra(enum ha_extra_function operation); @@ -235,6 +241,11 @@ public: int optimize(THD* thd, HA_CHECK_OPT* check_opt); bool is_fatal_error(int error_num, uint flags); +protected: +#ifndef MRN_HANDLER_RND_NEXT_IS_PUBLIC + int rnd_next(uchar *buf); +#endif + private: #ifndef MRN_HANDLER_CLOSE_IS_PUBLIC int close(); -------------- next part -------------- HTML����������������������������...下载
