diff options
| author | unknown <sasha@mysql.sashanet.com> | 2002-03-26 22:23:51 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2002-03-26 22:23:51 -0700 |
| commit | ef261914d3fdaaf25f1415b8625cc9ff89f9266a (patch) | |
| tree | addd464870d8ce2dc41b174031430761b68ff23e /include | |
| parent | 4252578b687e972cb482ab22efca01b8ea484221 (diff) | |
| parent | 079a551ca735e79f3d7a2ebbecf8be4d4ba7608a (diff) | |
| download | mariadb-git-ef261914d3fdaaf25f1415b8625cc9ff89f9266a.tar.gz | |
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 4 |
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 |