Merge naruto.:C:/cpp/bug25042/my50-bug25042

into  naruto.:C:/cpp/mysql-5.1-maint


mysys/my_wincond.c:
  Auto merged
include/my_pthread.h:
  SCCS merged

1 files changed, 11 insertions, 1 deletions

diff --git a/include/my_pthread.h b/include/my_pthread.h
index a3e1007bf31..725a4fbc071 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -69,7 +69,17 @@ typedef struct st_pthread_link {
 
 typedef struct {
   uint32 waiting;
-  HANDLE semaphore;
+  CRITICAL_SECTION lock_waiting;
+ 
+  enum {
+    SIGNAL= 0,
+    BROADCAST= 1,
+    MAX_EVENTS= 2
+  } EVENTS;
+
+  HANDLE events[MAX_EVENTS];
+  HANDLE broadcast_block_event;
+
 } pthread_cond_t;