diff options
| author | unknown <sanja@askmonty.org> | 2013-10-17 19:01:57 +0300 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2013-10-17 19:01:57 +0300 |
| commit | 8f4eb208d2988354f34b9a99e500c5c82d86ffbd (patch) | |
| tree | cfdf6b4ff5ab81a85cfaff5580d22b3d646cc324 /sql/mysqld.cc | |
| parent | d21f9bab3391e7fb0913d14cd77cb2832475927e (diff) | |
| parent | b88bf50ec138fbe3844a5859d884347c413dbf0d (diff) | |
| download | mariadb-git-8f4eb208d2988354f34b9a99e500c5c82d86ffbd.tar.gz | |
merge 10.0-base -> 10.0
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 1b8727563db..b12f60a031b 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2825,6 +2825,9 @@ bool one_thread_per_connection_end(THD *thd, bool put_in_cache) mysql_mutex_unlock(&LOCK_thread_count); } DBUG_LEAVE; // Must match DBUG_ENTER() +#ifndef EMBEDDED_LIBRARY + ERR_remove_state(0); +#endif my_thread_end(); pthread_exit(0); @@ -4463,6 +4466,7 @@ static void init_ssl() opt_ssl_cipher, &error, opt_ssl_crl, opt_ssl_crlpath); DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd)); + ERR_remove_state(0); if (!ssl_acceptor_fd) { sql_print_warning("Failed to setup SSL"); |