bzr commit into mysql-5.1 branch (stewart:2876)

[Stewart Smith]

#At file:///home/stewart/mysql/win-ndbwin32/

 2876 Stewart Smith	2008-10-02
      fix NDB_TICKS vs Uint32/int warnings for SignalSender
modified:
  storage/ndb/src/ndbapi/SignalSender.cpp

=== modified file 'storage/ndb/src/ndbapi/SignalSender.cpp'
--- a/storage/ndb/src/ndbapi/SignalSender.cpp	2008-09-17 13:23:21 +0000
+++ b/storage/ndb/src/ndbapi/SignalSender.cpp	2008-10-02 07:51:11 +0000
@@ -161,7 +161,7 @@ SignalSender::waitFor(Uint32 timeOutMill
 
   NDB_TICKS now = NdbTick_CurrentMillisecond();
   NDB_TICKS stop = now + timeOutMillis;
-  NDB_TICKS wait = (timeOutMillis == 0 ? 10 : timeOutMillis);
+  Uint32 wait = (timeOutMillis == 0 ? 10 : timeOutMillis);
   do {
     NdbCondition_WaitTimeout(m_cond,
 			     theFacade->theMutexPtr, 
@@ -178,7 +178,7 @@ SignalSender::waitFor(Uint32 timeOutMill
     }
     
     now = NdbTick_CurrentMillisecond();
-    wait = (timeOutMillis == 0 ? 10 : stop - now);
+    wait = (Uint32)(timeOutMillis == 0 ? 10 : stop - now);
   } while(stop > now || timeOutMillis == 0);
   
   return 0;