bk commit into 5.1 tree (anozdrin:1.2378)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.1 repository of alik. When alik does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-22 17:14:43+03:00, anozdrin@booka. +1 -0
  Make IM compiled on Win32: add pthread_join() impl.

  include/my_pthread.h@stripped, 2006-11-22 17:14:40+03:00, anozdrin@booka. +3 -0
    Add pthread_join() for Windows.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	anozdrin
# Host:	booka.
# Root:	/home/alik/MySQL/devel/5.1-rt-im

--- 1.96/include/my_pthread.h	2006-11-22 17:14:50 +03:00
+++ 1.97/include/my_pthread.h	2006-11-22 17:14:50 +03:00
@@ -130,6 +130,9 @@ void pthread_exit(void *a);	 /* was #def
 #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)