Commit 91f3074e authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/41-work 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
parents db6f4643 b9fd34a9

ndb/src/common/transporter/TransporterRegistry.cpp

+18 −16
Original line number Diff line number Diff line
@@ -814,22 +814,6 @@ TransporterRegistry::poll_TCP(Uint32 timeOutMillis) 
    return 0;

  }

  

  struct timeval timeout;

#ifdef NDB_OSE

  // Return directly if there are no TCP transporters configured

  

  if(timeOutMillis <= 1){

    timeout.tv_sec  = 0;

    timeout.tv_usec = 1025;

  } else {

    timeout.tv_sec  = timeOutMillis / 1000;

    timeout.tv_usec = (timeOutMillis % 1000) * 1000;

  }

#else  

  timeout.tv_sec  = timeOutMillis / 1000;

  timeout.tv_usec = (timeOutMillis % 1000) * 1000;

#endif



  NDB_SOCKET_TYPE maxSocketValue = -1;

  

  // Needed for TCP/IP connections
@@ -855,6 +839,24 @@ TransporterRegistry::poll_TCP(Uint32 timeOutMillis) 
    hasdata |= t->hasReceiveData();

  }

  

  timeOutMillis = hasdata ? 0 : timeOutMillis;

  

  struct timeval timeout;

#ifdef NDB_OSE

  // Return directly if there are no TCP transporters configured

  

  if(timeOutMillis <= 1){

    timeout.tv_sec  = 0;

    timeout.tv_usec = 1025;

  } else {

    timeout.tv_sec  = timeOutMillis / 1000;

    timeout.tv_usec = (timeOutMillis % 1000) * 1000;

  }

#else  

  timeout.tv_sec  = timeOutMillis / 1000;

  timeout.tv_usec = (timeOutMillis % 1000) * 1000;

#endif



  // The highest socket value plus one

  maxSocketValue++;