bk commit into 5.0 tree (tomas:1.1939)

[tomas]

Below is the list of changes that have just been committed into a local
5.0 repository of tomas. When tomas 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.1939 05/07/15 13:57:21 tomas@stripped +2 -0
  minor type fixes to prev patch

  ndb/src/mgmsrv/Services.cpp
    1.48 05/07/15 13:57:03 tomas@stripped +1 -1
    minor type fixes to prev patch

  ndb/src/mgmapi/ndb_logevent.cpp
    1.5 05/07/15 13:57:03 tomas@stripped +2 -3
    minor type fixes to prev patch

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.0

--- 1.47/ndb/src/mgmsrv/Services.cpp	2005-07-15 01:34:43 +02:00
+++ 1.48/ndb/src/mgmsrv/Services.cpp	2005-07-15 13:57:03 +02:00
@@ -1308,7 +1308,7 @@
   {
     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;

--- 1.4/ndb/src/mgmapi/ndb_logevent.cpp	2005-07-15 02:31:07 +02:00
+++ 1.5/ndb/src/mgmapi/ndb_logevent.cpp	2005-07-15 13:57:03 +02:00
@@ -392,9 +392,8 @@
 
     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)
     {