diff options
Diffstat (limited to 'sql/sql_audit.cc')
| -rw-r--r-- | sql/sql_audit.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sql/sql_audit.cc b/sql/sql_audit.cc index 3e9379ebe33..cbf3f971088 100644 --- a/sql/sql_audit.cc +++ b/sql/sql_audit.cc @@ -350,14 +350,11 @@ static my_bool calc_class_mask(THD *thd, plugin_ref plugin, void *arg) */ int finalize_audit_plugin(st_plugin_int *plugin) { + int deinit_status= 0; unsigned long event_class_mask[MYSQL_AUDIT_CLASS_MASK_SIZE]; - if (plugin->plugin->deinit && plugin->plugin->deinit(NULL)) - { - DBUG_PRINT("warning", ("Plugin '%s' deinit function returned error.", - plugin->name.str)); - DBUG_EXECUTE("finalize_audit_plugin", return 1; ); - } + if (plugin->plugin->deinit) + deinit_status= plugin->plugin->deinit(NULL); plugin->data= NULL; bzero(&event_class_mask, sizeof(event_class_mask)); @@ -376,7 +373,7 @@ int finalize_audit_plugin(st_plugin_int *plugin) bmove(mysql_global_audit_mask, event_class_mask, sizeof(event_class_mask)); mysql_mutex_unlock(&LOCK_audit_mask); - return 0; + return deinit_status; } |