Merge work:/home/bk/mysql-4.0

into mysql.sashanet.com:/reiser-data/mysql-4.0

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

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

sql/mysqld.cc

@@ -1720,6 +1720,12 @@ int main(int argc, char **argv)
   my_umask=0660;		// Default umask for new files
   my_umask_dir=0700;		// Default umask for new directories
   MAIN_THD;
+  /* initialize signal_th and shutdown_th to main_th for default value
+     as we need to initialize them to something safe. They are used
+     when compiled with safemalloc
+  */
+  SIGNAL_THD;
+  SHUTDOWN_THD;
   MY_INIT(argv[0]);		// init my_sys library & pthreads
   tzset();			// Set tzname