null+****@clear*****
null+****@clear*****
2011年 12月 28日 (水) 10:09:15 JST
Kouhei Sutou 2011-12-28 10:09:15 +0900 (Wed, 28 Dec 2011)
New Revision: 74e448a7992b31e67ecee3222fd1171a8f9c3f55
Log:
[mysql51] don't HA_EXTRA_ADD_CHILDREN_LIST and HA_EXTRA_IS_ATTACHED_CHILDREN.
Modified files:
ha_mroonga.cc
ha_mroonga.h
Modified: ha_mroonga.cc (+4 -0)
===================================================================
--- ha_mroonga.cc 2011-12-28 09:52:53 +0900 (a8f6174)
+++ ha_mroonga.cc 2011-12-28 10:09:15 +0900 (86b72f2)
@@ -419,15 +419,19 @@ static const char *mrn_inspect_extra_function(enum ha_extra_function operation)
case HA_EXTRA_PREPARE_FOR_RENAME:
inspected = "HA_EXTRA_PREPARE_FOR_RENAME";
break;
+#ifdef MRN_HAVE_HA_EXTRA_ADD_CHILDREN_LIST
case HA_EXTRA_ADD_CHILDREN_LIST:
inspected = "HA_EXTRA_ADD_CHILDREN_LIST";
break;
+#endif
case HA_EXTRA_ATTACH_CHILDREN:
inspected = "HA_EXTRA_ATTACH_CHILDREN";
break;
+#ifdef MRN_HAVE_HA_EXTRA_IS_ATTACHED_CHILDREN
case HA_EXTRA_IS_ATTACHED_CHILDREN:
inspected = "HA_EXTRA_IS_ATTACHED_CHILDREN";
break;
+#endif
case HA_EXTRA_DETACH_CHILDREN:
inspected = "HA_EXTRA_DETACH_CHILDREN";
break;
Modified: ha_mroonga.h (+5 -0)
===================================================================
--- ha_mroonga.h 2011-12-28 09:52:53 +0900 (d0457fd)
+++ ha_mroonga.h 2011-12-28 10:09:15 +0900 (f72f163)
@@ -96,6 +96,11 @@ extern "C" {
# define MRN_NEED_FREE_STRING_MEMALLOC_PLUGIN_VAR
#endif
+#if MYSQL_VERSION_ID >= 50500
+# define MRN_HAVE_HA_EXTRA_ADD_CHILDREN_LIST
+# define MRN_HAVE_HA_EXTRA_IS_ATTACHED_CHILDREN
+#endif
+
class ha_mroonga;
/* structs */