bk commit into 4.0 tree

[sasha]

Below is the list of changes that have just been committed into a
4.0 repository of sasha. When sasha does a push, they will be propogated 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2002-03-08 09:26:56-07:00, sasha@stripped
  DBUG_ASSERT_LOCK

  include/my_sys.h
    1.67 02/03/08 09:26:55 sasha@stripped +6 -0
    added DBUG_ASSERT_LOCK()

  sql/slave.cc
    1.158 02/03/08 09:26:55 sasha@stripped +1 -1
    use DBUG_ASSERT_LOCK()

# 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:	sasha
# Host:	mysql.sashanet.com
# Root:	/reiser-data/mysql-4.0

--- 1.66/include/my_sys.h	Fri Mar  1 18:58:21 2002
+++ 1.67/include/my_sys.h	Fri Mar  8 09:26:55 2002
@@ -725,6 +725,12 @@
 ulong checksum(const byte *mem, uint count);
 uint my_bit_log2(ulong value);
 
+#if defined(SAFE_MUTEX) && !defined(DBUG_OFF)
+#define DBUG_ASSERT_LOCK(lock) DBUG_ASSERT((lock)->count == 1 && \
+				   (lock)->thread == pthread_self())
+#else
+#define DBUG_ASSERT_LOCK(lock)
+#endif
 
 #if defined(_MSC_VER) && !defined(__WIN__)
 extern void sleep(int sec);

--- 1.157/sql/slave.cc	Sat Mar  2 22:00:35 2002
+++ 1.158/sql/slave.cc	Fri Mar  8 09:26:55 2002
@@ -361,7 +361,7 @@
     abstime.tv_sec=tv.tv_sec+2;
     abstime.tv_nsec=tv.tv_usec*1000;
 #endif
-    DBUG_ASSERT(cond_lock->count > 0 && cond_lock->thread == pthread_self());
+    DBUG_ASSERT_LOCK(cond_lock);
     pthread_cond_timedwait(term_cond, cond_lock, &abstime);
     if (*slave_running)
       KICK_SLAVE(thd);