bzr commit into mysql-6.0 branch (jperkin:3067)

[Jonathan Perkin]

#At file:///net/helheim/store/bteam/bzr/mysql-6.0.10-alpha-release/

 3067 Jonathan Perkin	2009-03-02
      Re-commit changes lost in previous merge.
modified:
  include/my_pthread.h
  mysys/thr_mutex.c

=== modified file 'include/my_pthread.h'
--- a/include/my_pthread.h	2009-02-23 11:55:35 +0000
+++ b/include/my_pthread.h	2009-03-02 21:52:37 +0000
@@ -495,7 +495,6 @@ void safe_mutex_free_deadlock_data(safe_
 #define my_pthread_mutex_lock(A,B) pthread_mutex_lock(A)
 #define safe_mutex_assert_owner(mp)
 #define safe_mutex_assert_not_owner(mp)
-#define safe_mutex_free_deadlock_data(mp)
 #endif /* SAFE_MUTEX */
 
 #if defined(MY_PTHREAD_FASTMUTEX) && !defined(SAFE_MUTEX)

=== modified file 'mysys/thr_mutex.c'
--- a/mysys/thr_mutex.c	2009-02-23 11:55:35 +0000
+++ b/mysys/thr_mutex.c	2009-03-02 21:52:37 +0000
@@ -35,7 +35,6 @@
 #undef pthread_mutex_destroy
 #undef pthread_cond_wait
 #undef pthread_cond_timedwait
-#undef safe_mutex_free_deadlock_data
 #ifdef HAVE_NONPOSIX_PTHREAD_MUTEX_INIT
 #define pthread_mutex_init(a,b) my_pthread_noposix_mutex_init((a),(b))
 #endif