Commit 68adc7b3 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 

into  booka.:/home/alik/MySQL/devel/5.1-rt-im
parents de2fbec4 4f096746

BitKeeper/etc/collapsed

+3 −0
Original line number Diff line number Diff line
@@ -17,3 +17,6 @@ 
452a92d0-31-8wSzSfZi165fcGcXPA

454a7ef8gdvE_ddMlJyghvOAkKPNOQ

454f8960jsVT_kMKJtZ9OCgXoba0xQ

4561b2ecZbhuAc0TTDdCdultxUYaMw

4561bde4qWhz1I8tkItXKex5uniipA

4562ba016dYH0JzszOqZ8p6psbKfnQ

include/my_pthread.h

+3 −0
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ void pthread_exit(void *a); /* was #define pthread_exit(A) ExitThread(A)*/ 
#define my_pthread_setprio(A,B)  SetThreadPriority(GetCurrentThread(), (B))

#define pthread_kill(A,B) pthread_dummy(0)



#define pthread_join(A,B) \

  ((WaitForSingleObject((A), INFINITE) != WAIT_OBJECT_0) || !CloseHandle(A))



/* Dummy defines for easier code */

#define pthread_attr_setdetachstate(A,B) pthread_dummy(0)

#define my_pthread_attr_setprio(A,B) pthread_attr_setprio(A,B)