diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-02 21:42:52 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-02 21:42:52 +0300 |
| commit | 90e058e0c623f770ee602ebab86e91303f08c90a (patch) | |
| tree | 33aa211800a7c5a746eb4cd1077a06ab8b549642 /libmysqld | |
| parent | 8b046db411b963f48b06716fab764a35456c43d7 (diff) | |
| parent | ee1950dab11b3b36ca61930c1733ccc4c721f21a (diff) | |
| download | mariadb-git-90e058e0c623f770ee602ebab86e91303f08c90a.tar.gz | |
Automatic merge
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 7de1ecd6ef3..d15aedd39e6 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -47,6 +47,7 @@ extern "C" void unireg_clear(int exit_code) { DBUG_ENTER("unireg_clear"); clean_up(!opt_help && (exit_code || !opt_bootstrap)); /* purecov: inspected */ + clean_up_mutexes(); my_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0); DBUG_VOID_RETURN; } @@ -576,6 +577,7 @@ void end_embedded_server() my_free((char*) copy_arguments_ptr, MYF(MY_ALLOW_ZERO_PTR)); copy_arguments_ptr=0; clean_up(0); + clean_up_mutexes(); } |