bzr push into mysql-5.1-telco-7.0-coord branch (jonas.oreland:4965 to 4966)

[Jonas Oreland]

 4966 Jonas Oreland	2012-09-13
      fix windows warning, update CMakeLists.txt

    modified:
      storage/ndb/src/common/debugger/signaldata/CMakeLists.txt
      storage/ndb/src/ndbapi/Ndb.cpp
      storage/ndb/test/ndbapi/CMakeLists.txt
 4965 Jonas Oreland	2012-09-13
      fix for release compile

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
=== modified file 'storage/ndb/src/common/debugger/signaldata/CMakeLists.txt'
--- a/storage/ndb/src/common/debugger/signaldata/CMakeLists.txt	2011-07-04 13:37:56 +0000
+++ b/storage/ndb/src/common/debugger/signaldata/CMakeLists.txt	2012-09-13 07:21:15 +0000
@@ -21,7 +21,7 @@ ADD_CONVENIENCE_LIBRARY(ndbsignaldata
         GetTabInfo.cpp
         SchemaTrans.cpp SchemaTransImpl.cpp
         TcKeyReq.cpp TcKeyConf.cpp TcKeyRef.cpp
-        TcRollbackRep.cpp
+        TcCommit.cpp TcRollbackRep.cpp
         TupKey.cpp TupCommit.cpp LqhKey.cpp
         FsOpenReq.cpp FsCloseReq.cpp FsRef.cpp FsConf.cpp FsReadWriteReq.cpp
         SignalDataPrint.cpp SignalNames.cpp

=== modified file 'storage/ndb/src/ndbapi/Ndb.cpp'
--- a/storage/ndb/src/ndbapi/Ndb.cpp	2012-09-12 13:07:04 +0000
+++ b/storage/ndb/src/ndbapi/Ndb.cpp	2012-09-13 07:21:15 +0000
@@ -350,9 +350,9 @@ Ndb::waitUntilReady(int timeout)
     now = NdbTick_CurrentMillisecond();
   }
 
-  Uint64 remain = end - now;
+  int remain = (int)((end - now) / 1000);
 
-  int res = theImpl->m_ndb_cluster_connection.wait_until_ready(remain/1000, 0);
+  int res = theImpl->m_ndb_cluster_connection.wait_until_ready(remain, 0);
   if (res < 0)
   {
     /**
@@ -379,8 +379,8 @@ Ndb::waitUntilReady(int timeout)
       /**
        * Some time remaining...use it
        */
-      remain = end - now;
-      theImpl->m_ndb_cluster_connection.wait_until_ready(0, remain/1000);
+      remain = (int)((end - now) / 1000);
+      theImpl->m_ndb_cluster_connection.wait_until_ready(0, remain);
     }
   }
 

=== modified file 'storage/ndb/test/ndbapi/CMakeLists.txt'
--- a/storage/ndb/test/ndbapi/CMakeLists.txt	2012-08-13 13:03:29 +0000
+++ b/storage/ndb/test/ndbapi/CMakeLists.txt	2012-09-13 07:21:15 +0000
@@ -71,6 +71,7 @@ ADD_EXECUTABLE(testLimits testLimits.cpp
 ADD_EXECUTABLE(testSingleUserMode testSingleUserMode.cpp)
 ADD_EXECUTABLE(testIndexStat testIndexStat.cpp)
 ADD_EXECUTABLE(testRedo testRedo.cpp)
+ADD_EXECUTABLE(testCoordTrans testCoordTrans.cpp)
 
 INSTALL(TARGETS create_all_tabs create_tab
   drop_all_tabs flexAsynch flexBench
@@ -86,4 +87,5 @@ INSTALL(TARGETS create_all_tabs create_t
   testNativeDefault testLimits testSpj
   testSingleUserMode
   testIndexStat testRedo
+  testCoordTrans
 DESTINATION bin)

No bundle (reason: useless for push emails).