[mysql-5.6] handler::close() is private. refs #1046

mroonga · Aug 12, 2011 · d1e677d · d1e677d
1 parent 0bb5ea3
commit d1e677d
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
@@ -2070,7 +2070,11 @@ int ha_mroonga::wrapper_close()
   MRN_DBUG_ENTER_METHOD();
   MRN_SET_WRAP_SHARE_KEY(share, table->s);
   MRN_SET_WRAP_TABLE_KEY(this, table);
+#ifdef MRN_HANDLER_CLOSE_IS_PUBLIC
   error = wrap_handler->close();
+#else
+  error = wrap_handler->ha_close();
+#endif
   MRN_SET_BASE_SHARE_KEY(share, table->s);
   MRN_SET_BASE_TABLE_KEY(this, table);
   delete wrap_handler;

diff --git a/ha_mroonga.h b/ha_mroonga.h
@@ -37,6 +37,10 @@ extern "C" {
 #  define MRN_HANDLER_CLONE_NEED_NAME 1
 #endif
 
+#if MYSQL_VERSION_ID < 50600
+#  define MRN_HANDLER_CLOSE_IS_PUBLIC 1
+#endif
+
 #if MYSQL_VERSION_ID < 50600
   typedef Item COND;
 #endif
@@ -136,7 +140,9 @@ class ha_mroonga: public handler
 
   int create(const char *name, TABLE *form, HA_CREATE_INFO *info); // required
   int open(const char *name, int mode, uint test_if_locked);       // required
+#ifdef MRN_HANDLER_CLOSE_IS_PUBLIC
   int close();                                                     // required
+#endif
   int info(uint flag);                                             // required
 
   uint lock_count() const;
@@ -230,6 +236,9 @@ class ha_mroonga: public handler
   bool is_fatal_error(int error_num, uint flags);
 
 private:
+#ifndef MRN_HANDLER_CLOSE_IS_PUBLIC
+  int close();
+#endif
   void check_count_skip(key_part_map start_key_part_map,
                         key_part_map end_key_part_map, bool fulltext);
   void check_fast_order_limit();