summaryrefslogtreecommitdiff
path: root/include/my_dbug.h
diff options
context:
space:
mode:
authorunknown <knielsen@mysql.com>2006-03-22 09:55:26 +0100
committerunknown <knielsen@mysql.com>2006-03-22 09:55:26 +0100
commite29144b4b5bedd1239c0045f73316a42eda1521d (patch)
tree2baa2b3b734e54ff428f3a5228d8d943681c23be /include/my_dbug.h
parentc8caeebf854d8df94b39c72d3003245fa1d372db (diff)
downloadmariadb-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 'include/my_dbug.h')
-rw-r--r--include/my_dbug.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_dbug.h b/include/my_dbug.h
index db2139fa2e2..65bb7b55d0d 100644
--- a/include/my_dbug.h
+++ b/include/my_dbug.h
@@ -81,6 +81,7 @@ extern FILE *_db_fp_(void);
#else /* No debugger */
#define DBUG_ENTER(a1)
+#define DBUG_LEAVE
#define DBUG_RETURN(a1) do { return(a1); } while(0)
#define DBUG_VOID_RETURN do { return; } while(0)
#define DBUG_EXECUTE(keyword,a1) do { } while(0)