diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-10 20:21:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-10 20:21:18 +0200 |
| commit | e44fefc7b395279b9682321f952490ab9d1d01f0 (patch) | |
| tree | 620b90cde4a5c1e05c8225eea14363d737b15c48 /sql/sql_plugin.cc | |
| parent | 49501b4ccb923475f259cccf66b90e8c6a5ed0ee (diff) | |
| download | mariadb-git-e44fefc7b395279b9682321f952490ab9d1d01f0.tar.gz | |
adding DBUG_ENTER/DBUG_RETURN tags that were useful when fixing memory leaks
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 16214c5edc8..eb7fa3222e5 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1125,7 +1125,7 @@ static void plugin_deinitialize(struct st_plugin_int *plugin, bool ref_check) static void plugin_del(struct st_plugin_int *plugin) { - DBUG_ENTER("plugin_del(plugin)"); + DBUG_ENTER("plugin_del"); mysql_mutex_assert_owner(&LOCK_plugin); /* Free allocated strings before deleting the plugin. */ mysql_rwlock_wrlock(&LOCK_system_variables_hash); @@ -2703,11 +2703,12 @@ static void restore_pluginvar_names(sys_var *first) */ static uchar *intern_sys_var_ptr(THD* thd, int offset, bool global_lock) { + DBUG_ENTER("intern_sys_var_ptr"); DBUG_ASSERT(offset >= 0); DBUG_ASSERT((uint)offset <= global_system_variables.dynamic_variables_head); if (!thd) - return (uchar*) global_system_variables.dynamic_variables_ptr + offset; + DBUG_RETURN((uchar*) global_system_variables.dynamic_variables_ptr + offset); /* dynamic_variables_head points to the largest valid offset @@ -2779,7 +2780,7 @@ static uchar *intern_sys_var_ptr(THD* thd, int offset, bool global_lock) mysql_rwlock_unlock(&LOCK_system_variables_hash); } - return (uchar*)thd->variables.dynamic_variables_ptr + offset; + DBUG_RETURN((uchar*)thd->variables.dynamic_variables_ptr + offset); } |