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 | e29144b4b5bedd1239c0045f73316a42eda1521d (patch) | |
tree | 2baa2b3b734e54ff428f3a5228d8d943681c23be /extra/comp_err.c | |
parent | c8caeebf854d8df94b39c72d3003245fa1d372db (diff) | |
download | mariadb-git-e29144b4b5bedd1239c0045f73316a42eda1521d.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 'extra/comp_err.c')
-rw-r--r-- | extra/comp_err.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/extra/comp_err.c b/extra/comp_err.c index 2d685a04087..0a77cf6f66d 100644 --- a/extra/comp_err.c +++ b/extra/comp_err.c @@ -188,8 +188,9 @@ int main(int argc, char *argv[]) DBUG_RETURN(1); } clean_up(lang_head, error_head); + DBUG_LEAVE; /* Can't use dbug after my_end() */ my_end(info_flag ? MY_CHECK_ERROR | MY_GIVE_INFO : 0); - DBUG_RETURN(0); + return 0; } } |