mysql51: make buildable again.

refs #1195 Reported by Kazuhiko Shiozaki. Thanks!!!
mroonga · Feb 24, 2012 · ff6533b · ff6533b
1 parent d043994
commit ff6533b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/ha_mroonga.cc b/ha_mroonga.cc
@@ -11430,6 +11430,7 @@ int ha_mroonga::get_foreign_key_list(THD *thd,
   DBUG_RETURN(res);
 }
 
+#ifdef MRN_HANDLER_HAVE_GET_PARENT_FOREIGN_KEY_LIST
 int ha_mroonga::wrapper_get_parent_foreign_key_list(THD *thd,
                                             List<FOREIGN_KEY_INFO> *f_key_list)
 {
@@ -11464,6 +11465,7 @@ int ha_mroonga::get_parent_foreign_key_list(THD *thd,
   }
   DBUG_RETURN(res);
 }
+#endif
 
 uint ha_mroonga::wrapper_referenced_by_foreign_key()
 {

diff --git a/ha_mroonga.h b/ha_mroonga.h
@@ -73,6 +73,7 @@ extern "C" {
 
 #if MYSQL_VERSION_ID >= 50500
 #  define MRN_HANDLER_HAVE_TRUNCATE
+#  define MRN_HANDLER_HAVE_GET_PARENT_FOREIGN_KEY_LIST
 #endif
 
 #if MYSQL_VERSION_ID >= 50500
@@ -409,7 +410,9 @@ class ha_mroonga: public handler
   char *get_tablespace_name(THD *thd, char *name, uint name_len);
   bool can_switch_engines();
   int get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list);
+#ifdef MRN_HANDLER_HAVE_GET_PARENT_FOREIGN_KEY_LIST
   int get_parent_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list);
+#endif
   uint referenced_by_foreign_key();
   void init_table_handle_for_HANDLER();
   void free_foreign_key_create_info(char* str);
@@ -865,8 +868,10 @@ class ha_mroonga: public handler
   bool storage_can_switch_engines();
   int wrapper_get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list);
   int storage_get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list);
+#ifdef MRN_HANDLER_HAVE_GET_PARENT_FOREIGN_KEY_LIST
   int wrapper_get_parent_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list);
   int storage_get_parent_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list);
+#endif
   uint wrapper_referenced_by_foreign_key();
   uint storage_referenced_by_foreign_key();
   void wrapper_init_table_handle_for_HANDLER();