null+****@clear*****
null+****@clear*****
2011年 8月 12日 (金) 10:14:16 JST
Kouhei Sutou 2011-08-12 01:14:16 +0000 (Fri, 12 Aug 2011)
New Revision: d1e677dd6985341e96ca24926de4d9c03e60d9cf
Log:
[mysql-5.6] handler::close() is private. refs #1046
Modified files:
ha_mroonga.cc
ha_mroonga.h
Modified: ha_mroonga.cc (+4 -0)
===================================================================
--- ha_mroonga.cc 2011-08-12 01:08:43 +0000 (0266cb4)
+++ ha_mroonga.cc 2011-08-12 01:14:16 +0000 (d3d76ba)
@@ -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;
Modified: ha_mroonga.h (+9 -0)
===================================================================
--- ha_mroonga.h 2011-08-12 01:08:43 +0000 (6132a05)
+++ ha_mroonga.h 2011-08-12 01:14:16 +0000 (393798e)
@@ -38,6 +38,10 @@ extern "C" {
#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 @@ public:
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 @@ public:
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();