diff options
| author | unknown <baker@bk-internal.mysql.com> | 2006-11-30 01:45:16 +0100 |
|---|---|---|
| committer | unknown <baker@bk-internal.mysql.com> | 2006-11-30 01:45:16 +0100 |
| commit | 46fd7deccbf9fcf75640ecdaa52667fc0d8e5832 (patch) | |
| tree | 5160560731f3ca95f2e5c117e3f25aaf3534caf2 /include | |
| parent | 2477bd5a03a3f578f17d35c96d26d34f418878b8 (diff) | |
| parent | 6949b04246beb07f03f9e5b16e45a54b12d453a8 (diff) | |
| download | mariadb-git-46fd7deccbf9fcf75640ecdaa52667fc0d8e5832.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 3 |
1 files changed, 3 insertions, 0 deletions
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) |