diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2013-11-25 21:38:01 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2013-11-25 21:38:01 +0400 |
| commit | fb2de582941e77830133bde20e439fcad73b9a11 (patch) | |
| tree | af9854f148468d804f23a2ee94e1809fafe5f6dc /sql/mysqld.cc | |
| parent | 1297a9ef19be9e3f3c42316d12a5aaf53a9f4ca1 (diff) | |
| download | mariadb-git-fb2de582941e77830133bde20e439fcad73b9a11.tar.gz | |
MDEV-5321 Calling mysql_library_end accesses freed memory; dumps memory to display.
Don't call the vio_end() in the clean_up() in EMBEDDED mode.
Call vio_end() before the end_embedded_server().
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 90c1a83b9fc..73995980ffc 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1851,7 +1851,9 @@ void clean_up(bool print_message) delete binlog_filter; delete rpl_filter; end_ssl(); +#ifndef EMBEDDED_LIBRARY vio_end(); +#endif /*!EMBEDDED_LIBRARY*/ my_regex_end(); #if defined(ENABLED_DEBUG_SYNC) /* End the debug sync facility. See debug_sync.cc. */ |