bk commit into 5.0 tree (Kristofer.Pettersson:1.2398)

[kpettersson]

Below is the list of changes that have just been committed into a local
5.0 repository of Kristofer Pettersson. When Kristofer Pettersson 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, 2007-03-09 08:02:29+01:00, Kristofer.Pettersson@naruto. +1 -0
  Merge naruto.:C:/cpp/bug25042/my50-bug25042
  into  naruto.:C:/cpp/mysql-5.0-maint
  MERGE: 1.2392.15.1

  include/my_pthread.h@stripped, 2007-03-09 08:02:23+01:00, Kristofer.Pettersson@naruto. +0 -0
    Auto merged
    MERGE: 1.95.1.4

# 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:	Kristofer.Pettersson
# Host:	naruto.
# Root:	C:/cpp/mysql-5.0-maint/RESYNC

--- 1.98/include/my_pthread.h	2007-03-09 08:02:54 +01:00
+++ 1.99/include/my_pthread.h	2007-03-09 08:02:54 +01:00
@@ -80,11 +80,17 @@ typedef struct st_pthread_link {
 
 typedef struct {
   uint32 waiting;
-#ifdef OS2
-  HEV    semaphore;
-#else
-  HANDLE semaphore;
-#endif
+  CRITICAL_SECTION lock_waiting;
+ 
+  enum {
+    SIGNAL= 0,
+    BROADCAST= 1,
+    MAX_EVENTS= 2
+  } EVENTS;
+
+  HANDLE events[MAX_EVENTS];
+  HANDLE broadcast_block_event;
+
 } pthread_cond_t;
 
 typedef int pthread_mutexattr_t;