bzr push into mysql-5.1 branch (pekka:3117 to 3118) WL#4391

[Pekka Nousiainen]

 3118 Pekka Nousiainen	2008-11-20
      wl#4391 32a_mutex.diff
      recursive mutex - temp disable on solaris (=> no DD)
modified:
  storage/ndb/src/kernel/blocks/lgman.cpp
  storage/ndb/src/kernel/blocks/tsman.cpp
  storage/ndb/src/kernel/vm/SafeMutex.cpp
  storage/ndb/src/kernel/vm/SafeMutex.hpp

 3117 Jonas Oreland	2008-11-19 [merge]
      merge 64-win to 64
modified:
  mysys/my_rename.c

=== modified file 'storage/ndb/src/kernel/blocks/lgman.cpp'
--- a/storage/ndb/src/kernel/blocks/lgman.cpp	2008-11-18 10:28:03 +0000
+++ b/storage/ndb/src/kernel/blocks/lgman.cpp	2008-11-20 13:32:13 +0000
@@ -56,7 +56,11 @@ Lgman::Lgman(Block_context & ctx) :
   m_tup(0),
   m_logfile_group_list(m_logfile_group_pool),
   m_logfile_group_hash(m_logfile_group_pool),
+#ifdef __sun // temp
+  m_client_mutex(1, false)
+#else
   m_client_mutex(2, true)
+#endif
 {
   BLOCK_CONSTRUCTOR(Lgman);
   

=== modified file 'storage/ndb/src/kernel/blocks/tsman.cpp'
--- a/storage/ndb/src/kernel/blocks/tsman.cpp	2008-11-18 10:28:03 +0000
+++ b/storage/ndb/src/kernel/blocks/tsman.cpp	2008-11-20 13:32:13 +0000
@@ -45,7 +45,11 @@ Tsman::Tsman(Block_context& ctx) :
   m_pgman(0),
   m_lgman(0),
   m_tup(0),
+#ifdef __sun // temp
+  m_client_mutex(1, false)
+#else
   m_client_mutex(2, true)
+#endif
 {
   BLOCK_CONSTRUCTOR(Tsman);
 

=== modified file 'storage/ndb/src/kernel/vm/SafeMutex.cpp'
--- a/storage/ndb/src/kernel/vm/SafeMutex.cpp	2008-11-16 15:24:54 +0000
+++ b/storage/ndb/src/kernel/vm/SafeMutex.cpp	2008-11-20 13:32:13 +0000
@@ -15,9 +15,6 @@
 
 #include "SafeMutex.hpp"
 
-//wl4391_todo
-#define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-
 NdbOut&
 operator<<(NdbOut& out, const SafeMutex& dm)
 {

=== modified file 'storage/ndb/src/kernel/vm/SafeMutex.hpp'
--- a/storage/ndb/src/kernel/vm/SafeMutex.hpp	2008-11-16 12:28:20 +0000
+++ b/storage/ndb/src/kernel/vm/SafeMutex.hpp	2008-11-20 13:32:13 +0000
@@ -26,6 +26,11 @@
 #include <ndb_types.h>
 #include <NdbOut.hpp>
 
+#undef HAVE_PTHREAD_MUTEX_RECURSIVE
+#ifdef __linux
+#define HAVE_PTHREAD_MUTEX_RECURSIVE
+#endif
+
 /*
  * Recursive mutex with a recursion limit >= 1.  Can be useful for
  * debugging.  If a recursive mutex is not wanted, one must rewrite