diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-10-16 17:58:15 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-10-16 17:58:15 +0400 |
| commit | 2b60ad363743cd9515cd3dddbaed7cad28c49e65 (patch) | |
| tree | 551e7e381fea88d74b68be8e72b75a7e32a8ea78 /sql/mysqld.cc | |
| parent | 7ba78277b4d76649501e85f05be2780e00ffc9c3 (diff) | |
| parent | de4ca539b896abfb2888ce7dee6f7de39d2e9657 (diff) | |
| download | mariadb-git-2b60ad363743cd9515cd3dddbaed7cad28c49e65.tar.gz | |
Merge 5.1->5.2
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 885f2e72190..a6623e9b239 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2134,6 +2134,9 @@ bool one_thread_per_connection_end(THD *thd, bool put_in_cache) /* It's safe to broadcast outside a lock (COND... is not deleted here) */ DBUG_PRINT("signal", ("Broadcasting COND_thread_count")); DBUG_LEAVE; // Must match DBUG_ENTER() +#ifndef EMBEDDED_LIBRARY + ERR_remove_state(0); +#endif my_thread_end(); (void) pthread_cond_broadcast(&COND_thread_count); @@ -3794,6 +3797,7 @@ static void init_ssl() opt_ssl_ca, opt_ssl_capath, opt_ssl_cipher, &error); 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"); |