Merge work:/my/mysql into tik.mysql.fi:/home/my/mysql

include/my_pthread.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

1 files changed, 0 insertions, 4 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 7d6863cb6eb..b7cd101695a 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -636,9 +636,7 @@ static void __cdecl kill_server(int sig_ptr)
     unireg_abort(1);				/* purecov: inspected */
   else
     unireg_end(0);
-#ifndef OS2
   pthread_exit(0);				/* purecov: deadcode */
-#endif
   RETURN_FROM_KILL_SERVER;
 }
 
@@ -670,9 +668,7 @@ static sig_handler print_signal_warning(int sig)
 void unireg_end(int signal_number __attribute__((unused)))
 {
   clean_up();
-#ifndef OS2
   pthread_exit(0);				// Exit is in main thread
-#endif
 }