diff options
| author | unknown <sasha@mysql.sashanet.com> | 2002-04-05 23:08:33 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2002-04-05 23:08:33 -0700 |
| commit | d85cacfa63eeaeebb4e23c9c85c8fcd2de3712cb (patch) | |
| tree | c0e45eda3e782bb6918904427d89df505db50a94 /mysys | |
| parent | 4930cfdde25698dfd6619b5d9458e71c1dd2a8d3 (diff) | |
| parent | a28f2ca67d968a669dab3a698b7f9b27a9c19f3d (diff) | |
| download | mariadb-git-d85cacfa63eeaeebb4e23c9c85c8fcd2de3712cb.tar.gz | |
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_static.h | 4 | ||||
| -rw-r--r-- | mysys/safemalloc.c | 2 |
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 |