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

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

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/ha_mroonga.cc b/ha_mroonga.cc
@@ -2577,7 +2577,11 @@ int ha_mroonga::wrapper_rnd_pos(uchar *buf, uchar *pos)
   MRN_DBUG_ENTER_METHOD();
   MRN_SET_WRAP_SHARE_KEY(share, table->s);
   MRN_SET_WRAP_TABLE_KEY(this, table);
+#ifdef MRN_HANDLER_RND_POS_IS_PUBLIC
   error = wrap_handler->rnd_pos(buf, pos);
+#else
+  error = wrap_handler->ha_rnd_pos(buf, pos);
+#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
@@ -45,6 +45,10 @@ extern "C" {
 #  define MRN_HANDLER_RND_NEXT_IS_PUBLIC 1
 #endif
 
+#if MYSQL_VERSION_ID < 50600
+#  define MRN_HANDLER_RND_POS_IS_PUBLIC 1
+#endif
+
 #if MYSQL_VERSION_ID < 50600
   typedef Item COND;
 #endif
@@ -160,7 +164,9 @@ class ha_mroonga: public handler
 #ifdef MRN_HANDLER_RND_NEXT_IS_PUBLIC
   int rnd_next(uchar *buf);                                        // required
 #endif
+#ifdef MRN_HANDLER_RND_POS_IS_PUBLIC
   int rnd_pos(uchar *buf, uchar *pos);                             // required
+#endif
   void position(const uchar *record);                              // required
   int extra(enum ha_extra_function operation);
   int extra_opt(enum ha_extra_function operation, ulong cache_size);
@@ -245,6 +251,9 @@ class ha_mroonga: public handler
 #ifndef MRN_HANDLER_RND_NEXT_IS_PUBLIC
   int rnd_next(uchar *buf);
 #endif
+#ifndef MRN_HANDLER_RND_POS_IS_PUBLIC
+  int rnd_pos(uchar *buf, uchar *pos);
+#endif
 
 private:
 #ifndef MRN_HANDLER_CLOSE_IS_PUBLIC