database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 5.1 -> 5.2

Browse Source
This commit is contained in:
Alexander Barkov
2013-10-21 13:35:43 +04:00
parent 2b60ad3637 11d141004a
commit c63b72c968
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/mysqld.cc
View File

@ -2134,7 +2134,7 @@ 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) */ /* It's safe to broadcast outside a lock (COND... is not deleted here) */
DBUG_PRINT("signal", ("Broadcasting COND_thread_count")); DBUG_PRINT("signal", ("Broadcasting COND_thread_count"));
DBUG_LEAVE; // Must match DBUG_ENTER() DBUG_LEAVE; // Must match DBUG_ENTER()
#ifndef EMBEDDED_LIBRARY #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
ERR_remove_state(0); ERR_remove_state(0);
#endif #endif
my_thread_end(); my_thread_end();

4
sql/slave.cc
View File

@ -2855,7 +2855,9 @@ err:
DBUG_LEAVE; // Must match DBUG_ENTER() DBUG_LEAVE; // Must match DBUG_ENTER()
my_thread_end(); my_thread_end();
#ifdef HAVE_OPENSSL
ERR_remove_state(0); ERR_remove_state(0);
#endif
pthread_exit(0); pthread_exit(0);
return 0; // Avoid compiler warnings return 0; // Avoid compiler warnings
} }
@ -3252,7 +3254,9 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \
DBUG_LEAVE; // Must match DBUG_ENTER() DBUG_LEAVE; // Must match DBUG_ENTER()
my_thread_end(); my_thread_end();
#ifdef HAVE_OPENSSL
ERR_remove_state(0); ERR_remove_state(0);
#endif
pthread_exit(0); pthread_exit(0);
return 0; // Avoid compiler warnings return 0; // Avoid compiler warnings
} }