Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/cps/mysql/trees/autofail/mysql-5.0

server-tools/instance-manager/thread_registry.h

@@ -100,7 +100,7 @@ class Thread_registry
   bool shutdown_in_progress;
   pthread_mutex_t LOCK_thread_registry;
   pthread_cond_t COND_thread_registry_is_empty;
-  pid_t sigwait_thread_pid;
+  pthread_t sigwait_thread_pid;
 };