mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Define USE_TLS when compiling libmysql.dll, to avoid crashing when
loaded at runtime. extra/comp_err.c: Don't use DBUG after my_end, crashes on Windows with USE_TLS. include/my_dbug.h: Add missing DBUG_LEAVE in non-debug builds. include/my_pthread.h: Add comment explaining USE_TLS. libmysql/cmakelists.txt: Add USE_TLS to avoid crashing when loading libmysql.dll at runtime. mysys/cmakelists.txt: Add USE_TLS to avoid crashing when loading libmysql.dll at runtime. mysys/my_init.c: Don't use DBUG after my_thread_end(), as it crashes on Windows TLS.
This commit is contained in:
@@ -134,7 +134,10 @@ void my_end(int infoflag)
|
||||
*/
|
||||
FILE *info_file= DBUG_FILE;
|
||||
my_bool print_info= (info_file != stderr);
|
||||
DBUG_ENTER("my_end");
|
||||
/* We do not use DBUG_ENTER here, as after cleanup DBUG is no longer
|
||||
operational, so we cannot use DBUG_RETURN.
|
||||
*/
|
||||
DBUG_PRINT("info",("Shutting down"));
|
||||
if (!info_file)
|
||||
{
|
||||
info_file= stderr;
|
||||
@@ -214,7 +217,6 @@ Voluntary context switches %ld, Involuntary context switches %ld\n",
|
||||
WSACleanup();
|
||||
#endif /* __WIN__ */
|
||||
my_init_done=0;
|
||||
DBUG_VOID_RETURN;
|
||||
} /* my_end */
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user