summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2002-03-26 22:23:51 -0700
committersasha@mysql.sashanet.com <>2002-03-26 22:23:51 -0700
commitab1fdbdeac6be0d77cf6ec46467699077d75ec28 (patch)
treeaddd464870d8ce2dc41b174031430761b68ff23e /include
parent6e4b213654831b4359f3d31b072d7a2b955390be (diff)
parentf28f8d086d3f5e1ede685b86ce64da5641437bcf (diff)
downloadmariadb-git-ab1fdbdeac6be0d77cf6ec46467699077d75ec28.tar.gz
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
Diffstat (limited to 'include')
-rw-r--r--include/my_sys.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index 4aee27e2939..3950bfce758 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -137,6 +137,10 @@ extern int NEAR my_errno; /* Last error in mysys */
#define NORMAL_SAFEMALLOC sf_malloc_quick=0
extern uint sf_malloc_prehunc,sf_malloc_endhunc,sf_malloc_quick;
extern ulonglong safemalloc_mem_limit;
+/* keep track of shutdown,signal, and main threads so that my_end() will not
+ report errors with them
+*/
+extern pthread_t shutdown_th, main_th,signal_th;
#define CALLER_INFO_PROTO , const char *sFile, uint uLine
#define CALLER_INFO , __FILE__, __LINE__
#define ORIG_CALLER_INFO , sFile, uLine