bzr push into mysql-trunk branch (marc.alff:3486 to 3487)

[Marc Alff]

 3487 Marc Alff	2011-10-06
      Build cleanup
      
      Fixed the safe mutex macros to be safe when used as in:
      
      if (cond)
        safe_mutex_assert_owner(...);
      
      do_something();
      
      which, because of the empty=broken macro, can expand to:
      
      if (cond)
        do_something();

    modified:
      include/my_pthread.h
 3486 Magne Mahre	2011-10-06 [merge]
      Merge from mysql-5.5

    modified:
      tests/mysql_client_test.c
=== modified file 'include/my_pthread.h'
--- a/include/my_pthread.h	2011-08-19 13:04:28 +0000
+++ b/include/my_pthread.h	2011-10-06 14:33:18 +0000
@@ -542,8 +542,8 @@ void safe_mutex_end(FILE *file);
           DBUG_ASSERT(! (mp)->count || \
                       ! pthread_equal(pthread_self(), (mp)->thread))
 #else
-#define safe_mutex_assert_owner(mp)
-#define safe_mutex_assert_not_owner(mp)
+#define safe_mutex_assert_owner(mp) do {} while (0)
+#define safe_mutex_assert_not_owner(mp) do {} while (0)
 #endif /* SAFE_MUTEX */
 
 #if defined(MY_PTHREAD_FASTMUTEX) && !defined(SAFE_MUTEX)

No bundle (reason: useless for push emails).