1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 5.3 -> 5.5

Browse Source
This commit is contained in:
Alexander Barkov 2013-10-21 13:37:17 +04:00
commit a06cd2cbe5
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/mysqld.cc
View File

@ -2615,7 +2615,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

@ -3377,7 +3377,9 @@ err_during_init:
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
} }
@ -3783,7 +3785,9 @@ err_during_init:
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
} }