Commit 4f4e9e77 authored by monty@tik.mysql.fi's avatar monty@tik.mysql.fi
Browse files

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

parents 55dd01cc e108cc77

include/my_pthread.h

+1 −0
Original line number Diff line number Diff line
@@ -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 */

sql/mysqld.cc

+0 −4
Original line number Diff line number Diff line
@@ -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

}