[mysql-5.6] handler::nnd_next() is protected. refs #1046

mroonga · Aug 12, 2011 · 3c739e9 · 3c739e9
1 parent d1e677d
commit 3c739e9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/ha_mroonga.cc b/ha_mroonga.cc
@@ -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);

diff --git a/ha_mroonga.h b/ha_mroonga.h
@@ -41,6 +41,10 @@ extern "C" {
 #  define MRN_HANDLER_CLOSE_IS_PUBLIC 1
 #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 @@ class ha_mroonga: public handler
 
   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 @@ class ha_mroonga: public handler
   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();