summaryrefslogtreecommitdiff
path: root/mysys/my_static.h
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-04-03 00:31:40 +0300
committerunknown <monty@hundin.mysql.fi>2002-04-03 00:31:40 +0300
commit8675a27328fbf9d3f52ec460e3b887dfe1630616 (patch)
treee52135a50534f813b63056ffcf4b9d7365b8559e /mysys/my_static.h
parent6a5c6b171fa6989052c2151475450856be125fc3 (diff)
downloadmariadb-git-8675a27328fbf9d3f52ec460e3b887dfe1630616.tar.gz
Make safemalloc work without threads
Diffstat (limited to 'mysys/my_static.h')
-rw-r--r--mysys/my_static.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/mysys/my_static.h b/mysys/my_static.h
index 88faf24ce82..2483c507e49 100644
--- a/mysys/my_static.h
+++ b/mysys/my_static.h
@@ -38,7 +38,9 @@ struct irem {
my_string _sFileName; /* File in which memory was new'ed */
uint _uLineNum; /* Line number in above file */
uint _uDataSize; /* Size requested */
+#ifdef THREAD
pthread_t thread_id;
+#endif
long _lSpecialValue; /* Underrun marker value */
};
@@ -57,11 +59,13 @@ extern const char *soundex_map;
extern USED_MEM* my_once_root_block;
extern uint my_once_extra;
+#ifdef THREAD
/*
- These threads are exept from safemalloc leak scrutiny unless
+ These threads are except from safemalloc leak scrutiny unless
PEDANTIC_SAFEMALLOC is defined
*/
extern pthread_t signal_thread, kill_thread;
+#endif
#ifndef HAVE_TEMPNAM
extern int _my_tempnam_used;