summaryrefslogtreecommitdiff
path: root/mysys/my_init.c
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2012-04-15 01:40:00 +0200
committerVladislav Vaintroub <wlad@montyprogram.com>2012-04-15 01:40:00 +0200
commit8bf7aae23e4448df3ec2a86f04d0a166fafdd1e6 (patch)
tree694a9217d62c90d6641b7040b8725d3ba1ba30fa /mysys/my_init.c
parent87b6f241064beb8f94669ba438e8c9c479016e76 (diff)
downloadmariadb-git-8bf7aae23e4448df3ec2a86f04d0a166fafdd1e6.tar.gz
fix application verifier crashes
Diffstat (limited to 'mysys/my_init.c')
-rw-r--r--mysys/my_init.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c
index c16602318ca..14f831f72b2 100644
--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@@ -29,6 +29,7 @@
#pragma comment(lib, "ws2_32")
#endif
my_bool have_tcpip=0;
+extern pthread_key(struct st_my_thread_var*, THR_KEY_mysys);
static void my_win_init(void);
static my_bool win32_init_tcp_ip();
#else
@@ -221,7 +222,9 @@ Voluntary context switches %ld, Involuntary context switches %ld\n",
if (have_tcpip)
WSACleanup();
#endif /* __WIN__ */
-
+
+ /* At very last, delete mysys key, it is used everywhere including DBUG */
+ pthread_key_delete(THR_KEY_mysys);
my_init_done=0;
} /* my_end */