bk commit into 5.0 tree (mronstrom:1.1846)

[mikael]

Below is the list of changes that have just been committed into a local
5.0 repository of mikron. When mikron does a push these changes will
be propagated 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1846 05/03/22 22:44:05 mronstrom@stripped +3 -0
  WL 2405
  Removed debug printouts
  Removed unused method
  Removed line left by mistake

  ndb/src/ndbapi/TransporterFacade.cpp
    1.40 05/03/22 22:43:56 mronstrom@stripped +2 -4
    Removed debug printouts
    Removed line remaining by mistake

  ndb/src/ndbapi/Ndbif.cpp
    1.30 05/03/22 22:43:56 mronstrom@stripped +0 -36
    Removed method no longer used, all its functionality moved into the
    PollGuard class
    Removed debug printouts

  ndb/include/ndbapi/Ndb.hpp
    1.44 05/03/22 22:43:55 mronstrom@stripped +0 -3
    Removed method no longer used, all its functionality moved into the
    PollGuard class

# 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:	mronstrom
# Host:	c-370ae253.1238-1-64736c10.cust.bredbandsbolaget.se
# Root:	/Users/mikron/wl2405

--- 1.43/ndb/include/ndbapi/Ndb.hpp	Tue Mar 22 15:38:34 2005
+++ 1.44/ndb/include/ndbapi/Ndb.hpp	Tue Mar 22 22:43:55 2005
@@ -1524,9 +1524,6 @@
   // synchronous and asynchronous interface
   void handleReceivedSignal(NdbApiSignal* anApiSignal, struct LinearSectionPtr ptr[3]);
   
-  // Receive response signals
-  int			receiveResponse(int waitTime = WAITFOR_RESPONSE_TIMEOUT);
-
   int			sendRecSignal(Uint16 aNodeId,
 				      Uint32 aWaitState,
 				      NdbApiSignal* aSignal,

--- 1.29/ndb/src/ndbapi/Ndbif.cpp	Tue Mar 22 22:30:57 2005
+++ 1.30/ndb/src/ndbapi/Ndbif.cpp	Tue Mar 22 22:43:56 2005
@@ -859,7 +859,6 @@
          Wake up the thread waiting for response and remove it from queue
          of objects waiting for receive completion
       */
-      //ndbout << "3Remove from cond wait queue object " << hex << t_waiter << endl;
       tp->remove_from_cond_wait_queue(t_waiter);
       t_waiter->cond_signal();
     }
@@ -927,7 +926,6 @@
           we must remove it from the conditional wait queue so that we
           don't assign it as poll owner later on.
         */
-        //ndbout << "2Remove from cond wait queue object " << hex << t_waiter << endl;
         tp->remove_from_cond_wait_queue(t_waiter);
         t_waiter->cond_signal();
       }
@@ -1298,40 +1296,6 @@
                theNdbBlockNumber);
   return poll_trans(aMillisecondNumber, minNoOfEventsToWakeup, &pg);
 }
-
-/*****************************************************************************
-int receiveOptimisedResponse();
-
-Return:  0 - Response received
-        -1 - Timeout occured waiting for response
-        -2 - Node failure interupted wait for response
-
-******************************************************************************/
-int	
-Ndb::receiveResponse(int waitTime){
-  int tResultCode;
-  TransporterFacade::instance()->checkForceSend(theNdbBlockNumber);
-
-  theImpl->theWaiter.wait(waitTime);
-  
-  if(theImpl->theWaiter.m_state == NO_WAIT) {
-    tResultCode = 0;
-  } else {
-
-#ifdef VM_TRACE
-    ndbout << "ERR: receiveResponse - theImpl->theWaiter.m_state = ";
-    ndbout << theImpl->theWaiter.m_state << endl;
-#endif
-
-    if (theImpl->theWaiter.m_state == WAIT_NODE_FAILURE){
-      tResultCode = -2;
-    } else {
-      tResultCode = -1;
-    }
-    theImpl->theWaiter.m_state = NO_WAIT;
-  }
-  return tResultCode;
-}//Ndb::receiveResponse()
 
 int
 Ndb::sendRecSignal(Uint16 node_id,

--- 1.39/ndb/src/ndbapi/TransporterFacade.cpp	Tue Mar 22 22:30:57 2005
+++ 1.40/ndb/src/ndbapi/TransporterFacade.cpp	Tue Mar 22 22:43:56 2005
@@ -573,7 +573,6 @@
   if (last_in_cond_wait == MAX_NO_THREADS)
     return NULL;
   tWaiter = cond_wait_array[index].cond_wait_object;
-  //ndbout << "4Remove from cond wait queue object " << hex << tWaiter << endl;
   remove_from_cond_wait_queue(tWaiter);
   return tWaiter;
 }
@@ -1291,7 +1290,6 @@
     response_time= WAITFOR_RESPONSE_TIMEOUT;
   else
     response_time= wait_time;
-    wait_time= (1 << 27); //A month is defined as forever :)
   NDB_TICKS curr_time = NdbTick_CurrentMillisecond();
   NDB_TICKS max_time = curr_time + (NDB_TICKS)wait_time;
   do
@@ -1317,7 +1315,9 @@
     wait_time= max_time - NdbTick_CurrentMillisecond();
     if (wait_time <= 0)
     {
+#ifdef VM_TRACE
       ndbout << "Time-out state is " << m_waiter->get_state() << endl;
+#endif
       m_waiter->set_state(WST_WAIT_TIMEOUT);
       ret_val= -1;
       break;
@@ -1345,12 +1345,10 @@
       queue if it hasn't happened already. It is usually already out of the
       queue but at time-out it could be that the object is still there.
     */
-    //ndbout << "Put in cond wait queue 1: " << hex << m_waiter << endl;
     Uint32 cond_wait_index= m_tp->put_in_cond_wait_queue(m_waiter);
     m_waiter->wait(wait_time);
     if (m_waiter->get_cond_wait_index() != TransporterFacade::MAX_NO_THREADS)
     {
-      //ndbout << "1Remove from cond wait queue object " << hex << m_waiter << endl;
       m_tp->remove_from_cond_wait_queue(m_waiter);
     }
   }