summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2002-04-05 23:07:25 -0700
committerunknown <sasha@mysql.sashanet.com>2002-04-05 23:07:25 -0700
commita28f2ca67d968a669dab3a698b7f9b27a9c19f3d (patch)
tree710c2693ff49ab62e90bea6c7c0baf9cbd1d7880 /mysys
parent91c373fc72e1648f1b312f3e1dd0c965a35a490b (diff)
downloadmariadb-git-a28f2ca67d968a669dab3a698b7f9b27a9c19f3d.tar.gz
safemalloc cleanup. Maybe it will now compile on FreeBSD. I still not have
access to a FreeBSD box, though. mysys/my_static.h: cleanup mysys/safemalloc.c: cleanup sql/mysqld.cc: initialize some safemalloc variables in main()
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_static.h4
-rw-r--r--mysys/safemalloc.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/mysys/my_static.h b/mysys/my_static.h
index 2483c507e49..8360728b057 100644
--- a/mysys/my_static.h
+++ b/mysys/my_static.h
@@ -61,10 +61,10 @@ extern uint my_once_extra;
#ifdef THREAD
/*
- These threads are except from safemalloc leak scrutiny unless
+ These threads are exempt from safemalloc leak scrutiny unless
PEDANTIC_SAFEMALLOC is defined
*/
-extern pthread_t signal_thread, kill_thread;
+extern pthread_t signal_th, kill_th, main_th;
#endif
#ifndef HAVE_TEMPNAM
diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c
index 925abd920ec..0c169f2f0cc 100644
--- a/mysys/safemalloc.c
+++ b/mysys/safemalloc.c
@@ -73,7 +73,7 @@
#include "mysys_err.h"
ulonglong safemalloc_mem_limit = ~(ulonglong)0;
-pthread_t shutdown_th=0,main_th=0,signal_th=0;
+pthread_t shutdown_th,main_th,signal_th;
#define pNext tInt._pNext
#define pPrev tInt._pPrev