diff options
| author | unknown <knielsen@mysql.com> | 2006-03-22 09:55:26 +0100 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-03-22 09:55:26 +0100 |
| commit | b082c999bfa56b1415fea327afef7f1e23b7045a (patch) | |
| tree | 2baa2b3b734e54ff428f3a5228d8d943681c23be /mysys/my_init.c | |
| parent | 573ee9cadab84eaecad55a413fe343e423013238 (diff) | |
| download | mariadb-git-b082c999bfa56b1415fea327afef7f1e23b7045a.tar.gz | |
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.
Diffstat (limited to 'mysys/my_init.c')
| -rw-r--r-- | mysys/my_init.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index efeee0fbc76..31757cd5df0 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -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 */ |