bzr push into mysql-5.1-telco-7.1 branch (jonas:4050 to 4051)

[Jonas Oreland]

 4051 Jonas Oreland	2011-01-13 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/src/kernel/vm/mt.cpp
      storage/ndb/src/mgmsrv/ConfigManager.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
      storage/ndb/src/ndbapi/Ndbif.cpp
      storage/ndb/src/ndbapi/SignalSender.cpp
      storage/ndb/src/ndbapi/trp_client.cpp
      storage/ndb/src/ndbapi/trp_client.hpp
 4050 Martin Zaun	2011-01-11 [merge]
      crund - merge from ndb-7.1-dbg64 to ndb-7.1

    added:
      storage/ndb/test/crund/config_samples/crundResult.properties
    modified:
      storage/ndb/test/crund/src/com/mysql/cluster/crund/ResultProcessor.java
=== modified file 'storage/ndb/src/kernel/vm/mt.cpp'
--- a/storage/ndb/src/kernel/vm/mt.cpp	2011-01-05 10:11:16 +0000
+++ b/storage/ndb/src/kernel/vm/mt.cpp	2011-01-13 11:15:34 +0000
@@ -370,7 +370,7 @@ inline
 void
 lock(struct thr_mutex<SZ>* sl)
 {
-  NdbMutex_Lock(&sl.m_mutex);
+  NdbMutex_Lock(&sl->m_mutex);
 }
 
 template <unsigned SZ>
@@ -379,7 +379,7 @@ inline
 void
 unlock(struct thr_mutex<SZ>* sl)
 {
-  NdbMutex_Unlock(&sl.m_mutex);
+  NdbMutex_Unlock(&sl->m_mutex);
 }
 
 template <unsigned SZ>
@@ -388,7 +388,7 @@ inline
 int
 trylock(struct thr_mutex<SZ> * sl)
 {
-  return NdbMutex_Trylock(&sl.m_mutex);
+  return NdbMutex_Trylock(&sl->m_mutex);
 }
 
 /**

=== modified file 'storage/ndb/src/mgmsrv/ConfigManager.cpp'
--- a/storage/ndb/src/mgmsrv/ConfigManager.cpp	2011-01-10 11:22:17 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigManager.cpp	2011-01-11 19:13:37 +0000
@@ -1939,6 +1939,7 @@ ConfigManager::run()
     }
   }
   stop_checkers();
+  ss.unlock();
 }
 
 

=== modified file 'storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp'
--- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2011-01-10 11:22:17 +0000
+++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2011-01-12 08:04:39 +0000
@@ -5803,7 +5803,7 @@ NdbDictInterface::forceGCPWait(int type)
         continue;
       }
 
-      m_impl->forceSend();
+      m_impl->do_forceSend();
       m_impl->unlock();
     }
     return m_error.code == 0 ? 0 : -1;

=== modified file 'storage/ndb/src/ndbapi/Ndbif.cpp'
--- a/storage/ndb/src/ndbapi/Ndbif.cpp	2011-01-10 11:22:17 +0000
+++ b/storage/ndb/src/ndbapi/Ndbif.cpp	2011-01-12 08:04:39 +0000
@@ -1204,7 +1204,7 @@ Ndb::sendPrepTrans(int forceSend)
     insert_completed_list(a_con);
   }//for
   theNoOfPreparedTransactions = 0;
-  theImpl->forceSend(forceSend);
+  theImpl->do_forceSend(forceSend);
   return;
 }//Ndb::sendPrepTrans()
 

=== modified file 'storage/ndb/src/ndbapi/SignalSender.cpp'
--- a/storage/ndb/src/ndbapi/SignalSender.cpp	2011-01-10 13:30:14 +0000
+++ b/storage/ndb/src/ndbapi/SignalSender.cpp	2011-01-12 08:04:39 +0000
@@ -203,7 +203,7 @@ SignalSender::sendFragmentedSignal(Uint1
                                      sig.header.m_noOfSections);
   if (ret == 0)
   {
-    forceSend();
+    do_forceSend();
     return SEND_OK;
   }
   return SEND_DISCONNECTED;
@@ -218,7 +218,7 @@ SignalSender::sendSignal(Uint16 nodeId, 
                            s->header.m_noOfSections);
   if (ret == 0)
   {
-    forceSend();
+    do_forceSend();
     return SEND_OK;
   }
   return SEND_DISCONNECTED;

=== modified file 'storage/ndb/src/ndbapi/trp_client.cpp'
--- a/storage/ndb/src/ndbapi/trp_client.cpp	2011-01-10 11:22:17 +0000
+++ b/storage/ndb/src/ndbapi/trp_client.cpp	2011-01-12 08:04:39 +0000
@@ -100,7 +100,7 @@ trp_client::cond_wait(Uint32 timeout, Nd
 }
 
 void
-trp_client::forceSend(int val)
+trp_client::do_forceSend(int val)
 {
   if (val == 0)
   {
@@ -157,7 +157,7 @@ int PollGuard::wait_scan(int wait_time, 
 int PollGuard::wait_for_input_in_loop(int wait_time, bool forceSend)
 {
   int ret_val;
-  m_clnt->forceSend(forceSend ? 1 : 0);
+  m_clnt->do_forceSend(forceSend ? 1 : 0);
 
   NDB_TICKS curr_time = NdbTick_CurrentMillisecond();
   NDB_TICKS max_time = curr_time + (NDB_TICKS)wait_time;

=== modified file 'storage/ndb/src/ndbapi/trp_client.hpp'
--- a/storage/ndb/src/ndbapi/trp_client.hpp	2011-01-10 11:22:17 +0000
+++ b/storage/ndb/src/ndbapi/trp_client.hpp	2011-01-12 08:04:39 +0000
@@ -44,7 +44,7 @@ public:
   void complete_poll();
   void wakeup();
 
-  void forceSend(int val = 1);
+  void do_forceSend(int val = 1);
 
   int raw_sendSignal(const NdbApiSignal*, Uint32 nodeId);
   int raw_sendSignal(const NdbApiSignal*, Uint32 nodeId,

No bundle (reason: useless for push emails).