diff options
| author | unknown <anozdrin/alik@booka.> | 2006-11-22 17:34:09 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@booka.> | 2006-11-22 17:34:09 +0300 |
| commit | 68adc7b3bf9920d9e471d9a1912db0ca4be33b90 (patch) | |
| tree | eb59f82909d249f23d807fcbd40890b15c1def19 | |
| parent | de2fbec489db579451d51a327f4e779d93996b87 (diff) | |
| parent | 4f096746752091b5da2c58994859852e24e0451b (diff) | |
| download | mariadb-git-68adc7b3bf9920d9e471d9a1912db0ca4be33b90.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into booka.:/home/alik/MySQL/devel/5.1-rt-im
| -rw-r--r-- | BitKeeper/etc/collapsed | 3 | ||||
| -rw-r--r-- | include/my_pthread.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index 226f0f1a2e2..f934fa44580 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -17,3 +17,6 @@ 452a92d0-31-8wSzSfZi165fcGcXPA 454a7ef8gdvE_ddMlJyghvOAkKPNOQ 454f8960jsVT_kMKJtZ9OCgXoba0xQ +4561b2ecZbhuAc0TTDdCdultxUYaMw +4561bde4qWhz1I8tkItXKex5uniipA +4562ba016dYH0JzszOqZ8p6psbKfnQ diff --git a/include/my_pthread.h b/include/my_pthread.h index 0cb38d29be8..8a0e1fc2b01 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -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) |