make buildable with MySQL 5.5.13. fixes #984

mroonga · Jun 9, 2011 · 74c14d8 · 74c14d8
1 parent e0ca429
commit 74c14d8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/ha_mroonga.cc b/ha_mroonga.cc
@@ -2787,11 +2787,19 @@ int ha_mroonga::reset()
   DBUG_RETURN(0);
 }
 
+#if MYSQL_VERSION_ID >= 50513
+handler *ha_mroonga::clone(const char *name, MEM_ROOT *mem_root)
+{
+  DBUG_ENTER("ha_mroonga::clone");
+  DBUG_RETURN(handler::clone(name, mem_root));
+}
+#else
 handler *ha_mroonga::clone(MEM_ROOT *mem_root)
 {
   DBUG_ENTER("ha_mroonga::clone");
   DBUG_RETURN(handler::clone(mem_root));
 }
+#endif
 
 uint8 ha_mroonga::table_cache_type()
 {

diff --git a/ha_mroonga.h b/ha_mroonga.h
@@ -173,7 +173,11 @@ class ha_mroonga: public handler
 
   int reset();
 
+#if MYSQL_VERSION_ID >= 50513
+  handler *clone(const char *name, MEM_ROOT *mem_root);
+#else
   handler *clone(MEM_ROOT *mem_root);
+#endif
   uint8 table_cache_type();
   int read_multi_range_first(KEY_MULTI_RANGE **found_range_p,
                              KEY_MULTI_RANGE *ranges,