Commit dbbd54e5 authored by unknown's avatar unknown
Browse files

minor type fixes to prev patch

parent d5072ac1
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -392,9 +392,8 @@ int ndb_logevent_get_next(const NdbLogEventHandle h,

    struct timeval now;
    gettimeofday(&now, 0);
    unsigned elapsed_ms=
      (now.tv_sec-start_time.tv_sec)*1000 +
      (now.tv_usec-start_time.tv_usec)/1000;
    unsigned elapsed_ms= (now.tv_sec-start_time.tv_sec)*1000 +
      ((signed int)now.tv_usec-(signed int)start_time.tv_usec)/1000;

    if (elapsed_ms >= timeout_in_milliseconds)
    {
+1 −1
Original line number Diff line number Diff line
@@ -1308,7 +1308,7 @@ Ndb_mgmd_event_service::log(int eventType, const Uint32* theData, NodeId nodeId)
  {
    if(threshold <= m_clients[i].m_logLevel.getLogLevel(cat))
    {
      int fd= m_clients[i].m_socket;
      NDB_SOCKET_TYPE fd= m_clients[i].m_socket;
      if(fd != NDB_INVALID_SOCKET)
      {
	int r;