mysql57: support PSI_memory_key for my_strdup()

mroonga · Mar 14, 2015 · d5daa79 · d5daa79
1 parent 60914f5
commit d5daa79
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
@@ -753,10 +753,10 @@ static void mrn_log_file_update(THD *thd, struct st_mysql_sys_var *var,
 
 #ifdef MRN_NEED_FREE_STRING_MEMALLOC_PLUGIN_VAR
   char *old_log_file_name = *old_value_ptr;
-  *old_value_ptr = my_strdup(new_log_file_name, MYF(MY_WME));
+  *old_value_ptr = mrn_my_strdup(new_log_file_name, MYF(MY_WME));
   my_free(old_log_file_name);
 #else
-  *old_value_ptr = my_strdup(new_log_file_name, MYF(MY_WME));
+  *old_value_ptr = mrn_my_strdup(new_log_file_name, MYF(MY_WME));
 #endif
 
   grn_ctx_fin(&ctx);
@@ -794,7 +794,7 @@ static void mrn_default_parser_update(THD *thd, struct st_mysql_sys_var *var,
 
 #ifdef MRN_NEED_FREE_STRING_MEMALLOC_PLUGIN_VAR
   my_free(*old_value_ptr);
-  *old_value_ptr = my_strdup(new_value, MYF(MY_WME));
+  *old_value_ptr = mrn_my_strdup(new_value, MYF(MY_WME));
 #else
   *old_value_ptr = (char *)new_value;
 #endif
@@ -848,7 +848,7 @@ static void mrn_vector_column_delimiter_update(THD *thd, struct st_mysql_sys_var
 
 #ifdef MRN_NEED_FREE_STRING_MEMALLOC_PLUGIN_VAR
   my_free(*old_value_ptr);
-  *old_value_ptr = my_strdup(new_value, MYF(MY_WME));
+  *old_value_ptr = mrn_my_strdup(new_value, MYF(MY_WME));
 #else
   *old_value_ptr = (char *)new_value;
 #endif
@@ -874,7 +874,7 @@ static void mrn_database_path_prefix_update(THD *thd,
   if (*old_value_ptr)
     my_free(*old_value_ptr);
   if (new_value)
-    *old_value_ptr = my_strdup(new_value, MYF(MY_WME));
+    *old_value_ptr = mrn_my_strdup(new_value, MYF(MY_WME));
   else
     *old_value_ptr = NULL;
 #else

diff --git a/mrn_mysql_compat.h b/mrn_mysql_compat.h
@@ -144,10 +144,13 @@
 #ifdef MRN_HAVE_PSI_MEMORY_KEY
 #  define mrn_my_malloc(size, flags) \
   my_malloc(mrn_memory_key, size, flags)
+#  define mrn_my_strdup(string, flags) \
+  my_strdup(mrn_memory_key, string, flags)
 #  define mrn_my_strndup(string, size, flags) \
   my_strndup(mrn_memory_key, string, size, flags)
 #else
 #  define mrn_my_malloc(size, flags) my_malloc(size, flags)
+#  define mrn_my_stndup(string, flags) my_strdup(string, flags)
 #  define mrn_my_strndup(string, size, flags) \
   my_strndup(string, size, flags)
 #endif