[mysql5.5.19][mysql5.6.4] don't free a malloced string plugin variable.

mroonga · Dec 21, 2011 · 626d5c4 · 626d5c4
1 parent 44d86a9
commit 626d5c4
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
@@ -273,7 +273,9 @@ static void mrn_default_parser_update(THD *thd, struct st_mysql_sys_var *var,
             "default fulltext parser is changed: <%s> -> <%s>",
             *old_value_ptr, new_value);
 
+#ifdef MRN_NEED_FREE_STRING_MEMALLOC_PLUGIN_VAR
     my_free(*old_value_ptr, MYF(0));
+#endif
     *old_value_ptr = my_strdup(new_value, MYF(MY_WME));
   }
   grn_ctx_fin(&ctx);

diff --git a/ha_mroonga.h b/ha_mroonga.h
@@ -91,6 +91,11 @@ extern "C" {
 #  define MRN_HAVE_MYSQL_TYPE_TIME2
 #endif
 
+#if (MYSQL_VERSION_ID < 50519) || \
+    (50600 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID < 50604)
+#  define MRN_NEED_FREE_STRING_MEMALLOC_PLUGIN_VAR
+#endif
+
 class ha_mroonga;
 
 /* structs */