From f736e3e1d25c492cc4eaa1aeb52bf369b7a84d33 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 4 Sep 2001 16:17:31 +0300 Subject: [PATCH] Portability fix --- include/my_pthread.h | 1 + sql/mysqld.cc | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/my_pthread.h b/include/my_pthread.h index 79baa7a53e3..c2c671ae28a 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -146,6 +146,7 @@ int pthread_mutex_destroy (pthread_mutex_t *); #define pthread_mutex_destroy(A) DeleteCriticalSection(A) #define my_pthread_setprio(A,B) SetThreadPriority(GetCurrentThread(), (B)) #define pthread_kill(A,B) pthread_dummy(0) +#define pthread_exit(A) pthread_dummy() #endif /* OS2 */ /* Dummy defines for easier code */ diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b484eee3480..cd532ac0f24 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -634,9 +634,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; } @@ -668,9 +666,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 }