List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:April 7 2011 7:56am
Subject:bzr push into mysql-5.1-telco-7.0 branch (jonas:4288 to 4291)
View as plain text  
 4291 Jonas Oreland	2011-04-07
      ndb - suppress newly introduced windows warning

    modified:
      support-files/compiler_warnings.supp
 4290 Jonas Oreland	2011-04-07
      ndb - warning in ndb_socket

    modified:
      storage/ndb/include/portlib/ndb_socket_posix.h
      storage/ndb/include/portlib/ndb_socket_win32.h
 4289 Jonas Oreland	2011-04-07
      ndb - another stab at warnings

    modified:
      storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp
      storage/ndb/include/util/HashMap.hpp
      storage/ndb/include/util/UtilBuffer.hpp
      storage/ndb/include/util/Vector.hpp
      storage/ndb/src/common/debugger/EventLogger.cpp
      storage/ndb/src/common/util/File.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
      storage/ndb/test/ndbapi/bank/Bank.cpp
      storage/ndb/test/ndbapi/testBasic.cpp
      storage/ndb/test/ndbapi/testDict.cpp
      storage/ndb/test/ndbapi/testIndex.cpp
      storage/ndb/test/ndbapi/testLcp.cpp
      storage/ndb/test/ndbapi/testNodeRestart.cpp
      storage/ndb/test/ndbapi/testReadPerf.cpp
      storage/ndb/test/ndbapi/testSRBank.cpp
      storage/ndb/test/ndbapi/testScan.cpp
      storage/ndb/test/ndbapi/testScanPerf.cpp
      storage/ndb/test/ndbapi/testTimeout.cpp
      storage/ndb/test/ndbapi/test_event.cpp
      storage/ndb/test/src/HugoOperations.cpp
      storage/ndb/test/tools/verify_index.cpp
      storage/ndb/tools/ndb_test_platform.cpp
 4288 Magnus Blåudd	2011-04-06
      ndb
       - fix merge error in toplevel Makefile.am causing mysys/tests to be built
         by "make dist"

    modified:
      Makefile.am
=== modified file 'storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp'
--- a/storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp	2011-02-01 21:05:11 +0000
+++ b/storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp	2011-04-07 07:22:49 +0000
@@ -55,7 +55,7 @@ private:
   
   SetLogLevelOrd& assign (const LogLevel& ll){
     noOfEntries = LogLevel::LOGLEVEL_CATEGORIES;
-    for(size_t i = 0; i<noOfEntries; i++){
+    for(Uint32 i = 0; i<noOfEntries; i++){
       theData[i] = (i << 16) | ll.getLogLevel((LogLevel::EventCategory)i);
     }
     return * this;
@@ -63,7 +63,7 @@ private:
 
   SetLogLevelOrd& assign (const EventSubscribeReq& ll){
     noOfEntries = ll.noOfEntries;
-    for(size_t i = 0; i<noOfEntries; i++){
+    for(Uint32 i = 0; i<noOfEntries; i++){
       theData[i] = ll.theData[i];
     }
     return * this;

=== modified file 'storage/ndb/include/portlib/ndb_socket_posix.h'
--- a/storage/ndb/include/portlib/ndb_socket_posix.h	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/include/portlib/ndb_socket_posix.h	2011-04-07 07:55:23 +0000
@@ -82,13 +82,13 @@ static inline ndb_socket_t my_socket_cre
   return s;
 }
 
-static inline size_t my_recv(ndb_socket_t s, char* buf, size_t len, int flags)
+static inline ssize_t my_recv(ndb_socket_t s, char* buf, size_t len, int flags)
 {
   return recv(s.fd, buf, len, flags);
 }
 
 static inline
-size_t my_send(ndb_socket_t s, const char* buf, size_t len, int flags)
+ssize_t my_send(ndb_socket_t s, const char* buf, size_t len, int flags)
 {
   return send(s.fd, buf, len, flags);
 }

=== modified file 'storage/ndb/include/portlib/ndb_socket_win32.h'
--- a/storage/ndb/include/portlib/ndb_socket_win32.h	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/include/portlib/ndb_socket_win32.h	2011-04-07 07:55:23 +0000
@@ -81,18 +81,18 @@ static inline ndb_socket_t my_socket_cre
   return s;
 }
 
-static inline size_t my_recv(ndb_socket_t s, char* buf, size_t len, int flags)
+static inline ssize_t my_recv(ndb_socket_t s, char* buf, size_t len, int flags)
 {
-  int ret= recv(s.s, buf, len, flags);
+  int ret= recv(s.s, buf, (int)len, flags);
   if (ret == SOCKET_ERROR)
     return -1;
   return ret;
 }
 
 static inline
-size_t my_send(ndb_socket_t s, const char* buf, size_t len, int flags)
+ssize_t my_send(ndb_socket_t s, const char* buf, size_t len, int flags)
 {
-  int ret= send(s.s, buf, len, flags);
+  int ret= send(s.s, buf, (int)len, flags);
   if (ret == SOCKET_ERROR)
     return -1;
   return ret;

=== modified file 'storage/ndb/include/util/HashMap.hpp'
--- a/storage/ndb/include/util/HashMap.hpp	2011-01-30 23:13:49 +0000
+++ b/storage/ndb/include/util/HashMap.hpp	2011-04-07 07:22:49 +0000
@@ -151,7 +151,7 @@ public:
   }
 
   bool remove(size_t i) {
-    Entry* entry = (Entry*)my_hash_element(&m_hash, i);
+    Entry* entry = (Entry*)my_hash_element(&m_hash, (ulong)i);
     if (entry == NULL)
       return false;
 
@@ -165,7 +165,7 @@ public:
   }
 
   T* value(size_t i) const {
-    Entry* entry = (Entry*)my_hash_element((HASH*)&m_hash, i);
+    Entry* entry = (Entry*)my_hash_element((HASH*)&m_hash, (ulong)i);
     if (entry == NULL)
       return NULL;
     return &(entry->m_value);

=== modified file 'storage/ndb/include/util/UtilBuffer.hpp'
--- a/storage/ndb/include/util/UtilBuffer.hpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/include/util/UtilBuffer.hpp	2011-04-07 07:22:49 +0000
@@ -89,7 +89,7 @@ public:
     len = 0;
   }
 
-  int length() const { return len; }
+  int length() const { assert(Uint64(len) == Uint32(len)); return (int)len; }
 
   void *get_data() const { return data; }
 

=== modified file 'storage/ndb/include/util/Vector.hpp'
--- a/storage/ndb/include/util/Vector.hpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/include/util/Vector.hpp	2011-04-07 07:22:49 +0000
@@ -51,7 +51,7 @@ public:
    */
   bool equal(const Vector<T>& obj) const;
 
-  int assign(const T*, Uint32 cnt);
+  int assign(const T*, unsigned cnt);
   int assign(const Vector<T>& obj) { return assign(obj.getBase(), obj.size());}
 
   T* getBase() { return m_items;}
@@ -94,7 +94,7 @@ Vector<T>::Vector(const Vector& src):
     m_incSize = 0;
     return;
   }
-  for(Uint32 i = 0; i < m_size; i++){
+  for(unsigned i = 0; i < m_size; i++){
     m_items[i] = src.m_items[i];
   }
 }
@@ -207,7 +207,7 @@ Vector<T>& 
 Vector<T>::operator=(const Vector<T>& obj){
   if(this != &obj){
     clear();
-    for(size_t i = 0; i<obj.size(); i++){
+    for(unsigned i = 0; i<obj.size(); i++){
       push_back(obj[i]);
     }
   }
@@ -216,10 +216,10 @@ Vector<T>::operator=(const Vector<T>& ob
 
 template<class T>
 int
-Vector<T>::assign(const T* src, Uint32 cnt)
+Vector<T>::assign(const T* src, unsigned cnt)
 {
   clear();
-  for (Uint32 i = 0; i<cnt; i++)
+  for (unsigned i = 0; i<cnt; i++)
   {
     int ret;
     if ((ret = push_back(src[i])))

=== modified file 'storage/ndb/src/common/debugger/EventLogger.cpp'
--- a/storage/ndb/src/common/debugger/EventLogger.cpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/src/common/debugger/EventLogger.cpp	2011-04-07 07:22:49 +0000
@@ -757,7 +757,7 @@ void getTextUNDORecordsExecuted(QQQQ) {
 		       theData[11]);
 }
 void getTextInfoEvent(QQQQ) {
-  BaseString::snprintf(m_text, m_text_len, (char *)&theData[1]);
+  BaseString::snprintf(m_text, m_text_len, "%s", (char *)&theData[1]);
 }
 const char bytes_unit[]= "B";
 const char kbytes_unit[]= "KB";
@@ -797,7 +797,7 @@ void getTextEventBufferStatus(QQQQ) {
 		       theData[7], theData[6]);
 }
 void getTextWarningEvent(QQQQ) {
-  BaseString::snprintf(m_text, m_text_len, (char *)&theData[1]);
+  BaseString::snprintf(m_text, m_text_len, "%s", (char *)&theData[1]);
 }
 void getTextGCP_TakeoverStarted(QQQQ) {
   BaseString::snprintf(m_text, m_text_len, "GCP Take over started");
@@ -1393,25 +1393,25 @@ EventLogger::log(int eventType, const Ui
 
     switch (severity){
     case Logger::LL_ALERT:
-      alert(log_text);
+      alert("%s", log_text);
       break;
     case Logger::LL_CRITICAL:
-      critical(log_text); 
+      critical("%s", log_text);
       break;
     case Logger::LL_WARNING:
-      warning(log_text); 
+      warning("%s", log_text);
       break;
     case Logger::LL_ERROR:
-      error(log_text); 
+      error("%s", log_text);
       break;
     case Logger::LL_INFO:
-      info(log_text); 
+      info("%s", log_text);
       break;
     case Logger::LL_DEBUG:
-      debug(log_text); 
+      debug("%s", log_text);
       break;
     default:
-      info(log_text); 
+      info("%s", log_text);
       break;
     }
   } // if (..

=== modified file 'storage/ndb/src/common/util/File.cpp'
--- a/storage/ndb/src/common/util/File.cpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/src/common/util/File.cpp	2011-04-07 07:22:49 +0000
@@ -71,7 +71,7 @@ File_class::File_class(const char* aFile
   m_file(NULL), 
   m_fileMode(mode)
 {
-  BaseString::snprintf(m_fileName, PATH_MAX, aFileName);
+  BaseString::snprintf(m_fileName, PATH_MAX, "%s", aFileName);
 }
 
 bool
@@ -88,7 +88,7 @@ File_class::open(const char* aFileName, 
     /**
      * Only copy if it's not the same string
      */
-    BaseString::snprintf(m_fileName, PATH_MAX, aFileName);
+    BaseString::snprintf(m_fileName, PATH_MAX, "%s", aFileName);
   }
   m_fileMode = mode;
   bool rc = true;

=== modified file 'storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2011-03-15 16:11:47 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2011-04-07 07:22:49 +0000
@@ -3946,7 +3946,7 @@ Dbdict::startRestoreSchema(Signal* signa
   if (c_restartRecord.m_start_banner)
   {
     jam();
-    infoEvent(c_restartRecord.m_start_banner);
+    infoEvent("%s", c_restartRecord.m_start_banner);
   }
 }
 
@@ -4168,7 +4168,7 @@ Dbdict::restart_fromWriteSchemaFile(Sign
   if (c_restartRecord.m_end_banner)
   {
     jam();
-    infoEvent(c_restartRecord.m_end_banner);
+    infoEvent("%s", c_restartRecord.m_end_banner);
   }
 
   execute(signal, c_schemaRecord.m_callback, retCode);

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2011-04-05 09:38:31 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2011-04-07 07:22:49 +0000
@@ -22159,12 +22159,12 @@ Dblqh::match_and_print(Signal* signal, P
 		       tcRec.p->transid[0], tcRec.p->transid[1],
 		       op,
 		       state);
-  
+
   if (!ERROR_INSERTED(4002))
-    infoEvent(buf);
+    infoEvent("%s", buf);
   else
-    ndbout_c(buf);
-  
+    ndbout_c("%s", buf);
+
   memcpy(signal->theData, temp, 4*len);
   return true;
 }
@@ -22809,7 +22809,7 @@ Dblqh::execDUMP_STATE_ORD(Signal* signal
 			   "OP[%u]: transid: 0x%x 0x%x key: %s",
 			   tcRec.i,
 			   tcRec.p->transid[0], tcRec.p->transid[1], key.c_str());
-      infoEvent(buf);
+      infoEvent("%s", buf);
     }
   }
   

=== modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp	2011-02-07 13:21:49 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp	2011-04-07 07:22:49 +0000
@@ -611,6 +611,10 @@ void Dbtup::execTUPFRAGREQ(Signal* signa
   Uint64 minRows =
     (((Uint64)req->minRowsHigh) << 32) + req->minRowsLow;
 
+  (void)reqinfo;
+  (void)maxRows;
+  (void)minRows;
+
   if (req->userPtr == (Uint32)-1) 
   {
     jam();
@@ -2456,14 +2460,14 @@ Dbtup::start_restore_lcp(Uint32 tableId,
   TablerecPtr tabPtr;
   tabPtr.i= tableId;
   ptrCheckGuard(tabPtr, cnoOfTablerec, tablerec);
-  
-  ndbassert(tabPtr.p->m_attributes[DD].m_no_of_fixsize < (1 << 16));
-  ndbassert(tabPtr.p->m_attributes[DD].m_no_of_varsize < (1 << 16));
-  
-  Uint32 saveAttrCounts = 
-    (tabPtr.p->m_attributes[DD].m_no_of_fixsize << 16) |
-    (tabPtr.p->m_attributes[DD].m_no_of_varsize << 0);
-  
+
+  ndbassert(Uint16(tabPtr.p->m_attributes[DD].m_no_of_fixsize << 16) == 0);
+  ndbassert(Uint16(tabPtr.p->m_attributes[DD].m_no_of_varsize << 16) == 0);
+
+  Uint32 saveAttrCounts =
+    (Uint32(tabPtr.p->m_attributes[DD].m_no_of_fixsize) << 16) |
+    (Uint32(tabPtr.p->m_attributes[DD].m_no_of_varsize) << 0);
+
   tabPtr.p->m_dropTable.tabUserPtr= saveAttrCounts;
   tabPtr.p->m_dropTable.tabUserRef= (tabPtr.p->m_bits & Tablerec::TR_RowGCI)? 1 : 0;
   tabPtr.p->m_createTable.defValLocation = tabPtr.p->m_default_value_location;

=== modified file 'storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp'
--- a/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2011-02-23 19:28:26 +0000
+++ b/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2011-04-07 07:22:49 +0000
@@ -1117,7 +1117,7 @@ retry:
 		       "I think president is: %d",
 		       nodeId, president, cpresident);
 
-  ndbout_c(buf);
+  ndbout_c("%s", buf);
   CRASH_INSERTION(933);
 
   if (getNodeState().startLevel == NodeState::SL_STARTED)
@@ -2791,7 +2791,7 @@ void Qmgr::checkStartInterface(Signal* s
                                nodePtr.i, 
                                (getNodeInfo(nodePtr.i).m_heartbeat_cnt + 1)/60,
                                nodePtr.p->failState);
-	  warningEvent(buf);
+	  warningEvent("%s", buf);
           if (((getNodeInfo(nodePtr.i).m_heartbeat_cnt + 1) % 300) == 0)
           {
             jam();
@@ -5772,7 +5772,7 @@ Qmgr::execDUMP_STATE_ORD(Signal* signal)
         sprintf(buf, "Node %d: <UNKNOWN>(%d)", i, nodePtr.p->phase);
         break;
       }
-      infoEvent(buf);
+      infoEvent("%s", buf);
     }
   }
 

=== modified file 'storage/ndb/test/ndbapi/bank/Bank.cpp'
--- a/storage/ndb/test/ndbapi/bank/Bank.cpp	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/test/ndbapi/bank/Bank.cpp	2011-04-07 07:22:49 +0000
@@ -2221,7 +2221,7 @@ int Bank::increaseSystemValue(SystemValu
     printf("value actual=%lld\n", valueNewRec->u_64_value());
     printf("value expected=%lld actual=%lld\n", value, valueNewRec->u_64_value());
     
-    DBUG_PRINT("info", ("value expected=%ld actual=%ld", value, valueNewRec->u_64_value()));
+    DBUG_PRINT("info", ("value expected=%ld actual=%ld", (long)value, (long)valueNewRec->u_64_value()));
     g_err << "getNextTransactionId: value was not updated" << endl;
     m_ndb.closeTransaction(pTrans);
     DBUG_RETURN(NDBT_FAILED);

=== modified file 'storage/ndb/test/ndbapi/testBasic.cpp'
--- a/storage/ndb/test/ndbapi/testBasic.cpp	2011-01-30 20:56:00 +0000
+++ b/storage/ndb/test/ndbapi/testBasic.cpp	2011-04-07 07:22:49 +0000
@@ -1287,12 +1287,12 @@ int
 runBug25090(NDBT_Context* ctx, NDBT_Step* step){
   
   Ndb* pNdb = GETNDB(step);
-  NdbDictionary::Dictionary * dict = pNdb->getDictionary();
+  //NdbDictionary::Dictionary * dict = pNdb->getDictionary();
 
   HugoOperations ops(*ctx->getTab());
   
   int loops = ctx->getNumLoops();
-  const int rows = ctx->getNumRecords();
+  //const int rows = ctx->getNumRecords();
   
   while (loops--)
   {
@@ -1317,7 +1317,7 @@ runDeleteRead(NDBT_Context* ctx, NDBT_St
 
   int a;
   int loops = ctx->getNumLoops();
-  const int rows = ctx->getNumRecords();
+  //const int rows = ctx->getNumRecords();
   
   while (loops--)
   {
@@ -1371,12 +1371,12 @@ runBug27756(NDBT_Context* ctx, NDBT_Step
 {
   
   Ndb* pNdb = GETNDB(step);
-  NdbDictionary::Dictionary * dict = pNdb->getDictionary();
+  //NdbDictionary::Dictionary * dict = pNdb->getDictionary();
   
   HugoOperations ops(*ctx->getTab());
 
   int loops = ctx->getNumLoops();
-  const int rows = ctx->getNumRecords();
+  //const int rows = ctx->getNumRecords();
   
   Vector<Uint64> copies;
   while (loops--)
@@ -1832,7 +1832,7 @@ runBug34348(NDBT_Context* ctx, NDBT_Step
         }
       }
       chk1(result == NDBT_OK);
-      assert(BitmaskImpl::count(sz, rowmask)== rowcnt);
+      assert(BitmaskImpl::count(sz, rowmask)== (Uint32)rowcnt);
 
       // delete about 1/2 remaining
       while (result == NDBT_OK)
@@ -1852,7 +1852,7 @@ runBug34348(NDBT_Context* ctx, NDBT_Step
         break;
       }
       chk1(result == NDBT_OK);
-      assert(BitmaskImpl::count(sz, rowmask)== rowcnt);
+      assert(BitmaskImpl::count(sz, rowmask)== (Uint32)rowcnt);
 
       // insert until full again
       while (result == NDBT_OK)
@@ -1874,7 +1874,7 @@ runBug34348(NDBT_Context* ctx, NDBT_Step
         break;
       }
       chk1(result == NDBT_OK);
-      assert(BitmaskImpl::count(sz, rowmask)== rowcnt);
+      assert(BitmaskImpl::count(sz, rowmask)== (Uint32)rowcnt);
 
       // delete all
       while (result == NDBT_OK)
@@ -1892,7 +1892,7 @@ runBug34348(NDBT_Context* ctx, NDBT_Step
         break;
       }
       chk1(result == NDBT_OK);
-      assert(BitmaskImpl::count(sz, rowmask)== rowcnt);
+      assert(BitmaskImpl::count(sz, rowmask)== (Uint32)rowcnt);
       assert(rowcnt == 0);
 
       loop++;

=== modified file 'storage/ndb/test/ndbapi/testDict.cpp'
--- a/storage/ndb/test/ndbapi/testDict.cpp	2011-02-21 15:08:51 +0000
+++ b/storage/ndb/test/ndbapi/testDict.cpp	2011-04-07 07:22:49 +0000
@@ -8123,7 +8123,7 @@ runBug58277errtest(NDBT_Context* ctx, ND
   NdbDictionary::Dictionary* pDic = pNdb->getDictionary();
   const int loops = ctx->getNumLoops();
   int result = NDBT_OK;
-  const int rows = ctx->getNumRecords();
+  //const int rows = ctx->getNumRecords();
   NdbRestarter restarter;
   const char* tabname = tabName_Bug58277;
   const char* indname = indName_Bug58277;
@@ -8342,7 +8342,6 @@ runBug58277scanop(NDBT_Context* ctx, NDB
           }
           if (type == 3)
           {
-            NdbOperation* pOp = 0;
             CHK2(pSOp->deleteCurrentTuple(pTx) == 0, pSOp->getNdbError());
             break;
           }
@@ -8640,7 +8639,7 @@ runBug57057(NDBT_Context* ctx, NDBT_Step
   const bool rss_check = ctx->getProperty("RSS_CHECK", (Uint32)0);
   NdbRestarter restarter;
   const char* tabname = tabName_Bug58277;
-  const char* indname = indName_Bug58277;
+  //const char* indname = indName_Bug58277;
   (void)pDic->dropTable(tabname);
 
   int loop = 0;

=== modified file 'storage/ndb/test/ndbapi/testIndex.cpp'
--- a/storage/ndb/test/ndbapi/testIndex.cpp	2011-04-01 07:10:05 +0000
+++ b/storage/ndb/test/ndbapi/testIndex.cpp	2011-04-07 07:22:49 +0000
@@ -2612,7 +2612,7 @@ runBug56829(NDBT_Context* ctx, NDBT_Step
         const NdbDictionary::Column* col = pTab->getColumn(j);
         if (col->getPrimaryKey() || calc.isUpdateCol(j))
           continue;
-        CHARSET_INFO* cs = col->getCharset();
+        //CHARSET_INFO* cs = col->getCharset();
         if (NdbSqlUtil::check_column_for_ordered_index(col->getType(), col->getCharset()) == 0)
         {
           ind.addColumn(*col);

=== modified file 'storage/ndb/test/ndbapi/testLcp.cpp'
--- a/storage/ndb/test/ndbapi/testLcp.cpp	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/test/ndbapi/testLcp.cpp	2011-04-07 07:22:49 +0000
@@ -343,7 +343,7 @@ static int load_table()
   size_t op = 0;
   size_t rows = 0;
   size_t uncommitted = 0;
-  bool prepared = false;
+  //bool prepared = false;
   for(size_t i = 0; i<(size_t)g_rows; i++){
     for(op %= OP_COUNT; !((1 << op) & g_use_ops); op = (op + 1) % OP_COUNT);
     g_ops[i] = g_op_types[op++];

=== modified file 'storage/ndb/test/ndbapi/testNodeRestart.cpp'
--- a/storage/ndb/test/ndbapi/testNodeRestart.cpp	2011-02-21 13:17:16 +0000
+++ b/storage/ndb/test/ndbapi/testNodeRestart.cpp	2011-04-07 07:22:49 +0000
@@ -2344,10 +2344,10 @@ runDropBigTable(NDBT_Context* ctx, NDBT_
 int
 runBug31525(NDBT_Context* ctx, NDBT_Step* step)
 {
-  int result = NDBT_OK;
-  int loops = ctx->getNumLoops();
-  int records = ctx->getNumRecords();
-  Ndb* pNdb = GETNDB(step);
+  //int result = NDBT_OK;
+  //int loops = ctx->getNumLoops();
+  //int records = ctx->getNumRecords();
+  //Ndb* pNdb = GETNDB(step);
   NdbRestarter res;
 
   if (res.getNumDbNodes() < 2)
@@ -2418,9 +2418,9 @@ runBug31525(NDBT_Context* ctx, NDBT_Step
 int
 runBug31980(NDBT_Context* ctx, NDBT_Step* step)
 {
-  int result = NDBT_OK;
-  int loops = ctx->getNumLoops();
-  int records = ctx->getNumRecords();
+  //int result = NDBT_OK;
+  //int loops = ctx->getNumLoops();
+  //int records = ctx->getNumRecords();
   Ndb* pNdb = GETNDB(step);
   NdbRestarter res;
 
@@ -2470,10 +2470,10 @@ runBug31980(NDBT_Context* ctx, NDBT_Step
 int
 runBug32160(NDBT_Context* ctx, NDBT_Step* step)
 {
-  int result = NDBT_OK;
-  int loops = ctx->getNumLoops();
-  int records = ctx->getNumRecords();
-  Ndb* pNdb = GETNDB(step);
+  //int result = NDBT_OK;
+  //int loops = ctx->getNumLoops();
+  //int records = ctx->getNumRecords();
+  //Ndb* pNdb = GETNDB(step);
   NdbRestarter res;
 
   if (res.getNumDbNodes() < 2)
@@ -2515,10 +2515,10 @@ runBug32160(NDBT_Context* ctx, NDBT_Step
 int
 runBug32922(NDBT_Context* ctx, NDBT_Step* step)
 {
-  int result = NDBT_OK;
+  //int result = NDBT_OK;
   int loops = ctx->getNumLoops();
-  int records = ctx->getNumRecords();
-  Ndb* pNdb = GETNDB(step);
+  //int records = ctx->getNumRecords();
+  //Ndb* pNdb = GETNDB(step);
   NdbRestarter res;
 
   if (res.getNumDbNodes() < 2)
@@ -2744,10 +2744,10 @@ runNF_commit(NDBT_Context* ctx, NDBT_Ste
 int
 runBug34702(NDBT_Context* ctx, NDBT_Step* step)
 {
-  int result = NDBT_OK;
+  //int result = NDBT_OK;
   int loops = ctx->getNumLoops();
-  int records = ctx->getNumRecords();
-  Ndb* pNdb = GETNDB(step);
+  //int records = ctx->getNumRecords();
+  //Ndb* pNdb = GETNDB(step);
   NdbRestarter res;
 
   if (res.getNumDbNodes() < 2)
@@ -2780,7 +2780,7 @@ runBug34702(NDBT_Context* ctx, NDBT_Step
 int
 runMNF(NDBT_Context* ctx, NDBT_Step* step)
 {
-  int result = NDBT_OK;
+  //int result = NDBT_OK;
   NdbRestarter res;
   
   if (res.getNumDbNodes() < 2)
@@ -2981,8 +2981,8 @@ runMNF(NDBT_Context* ctx, NDBT_Step* ste
 int 
 runBug36199(NDBT_Context* ctx, NDBT_Step* step)
 {
-  int result = NDBT_OK;
-  int loops = ctx->getNumLoops();
+  //int result = NDBT_OK;
+  //int loops = ctx->getNumLoops();
   NdbRestarter res;
 
   if (res.getNumDbNodes() < 4)
@@ -3030,8 +3030,8 @@ runBug36199(NDBT_Context* ctx, NDBT_Step
 int 
 runBug36246(NDBT_Context* ctx, NDBT_Step* step)
 { 
-  int result = NDBT_OK;
-  int loops = ctx->getNumLoops();
+  //int result = NDBT_OK;
+  //int loops = ctx->getNumLoops();
   NdbRestarter res;
   Ndb* pNdb = GETNDB(step);
 
@@ -3118,8 +3118,8 @@ loop:
 int 
 runBug36247(NDBT_Context* ctx, NDBT_Step* step)
 { 
-  int result = NDBT_OK;
-  int loops = ctx->getNumLoops();
+  //int result = NDBT_OK;
+  //int loops = ctx->getNumLoops();
   NdbRestarter res;
   Ndb* pNdb = GETNDB(step);
 
@@ -3212,10 +3212,10 @@ loop:
 int 
 runBug36276(NDBT_Context* ctx, NDBT_Step* step)
 { 
-  int result = NDBT_OK;
-  int loops = ctx->getNumLoops();
+  //int result = NDBT_OK;
+  //int loops = ctx->getNumLoops();
   NdbRestarter res;
-  Ndb* pNdb = GETNDB(step);
+  //Ndb* pNdb = GETNDB(step);
   
   if (res.getNumDbNodes() < 4)
     return NDBT_OK;
@@ -3257,8 +3257,8 @@ runBug36276(NDBT_Context* ctx, NDBT_Step
 int 
 runBug36245(NDBT_Context* ctx, NDBT_Step* step)
 { 
-  int result = NDBT_OK;
-  int loops = ctx->getNumLoops();
+  //int result = NDBT_OK;
+  //int loops = ctx->getNumLoops();
   NdbRestarter res;
   Ndb* pNdb = GETNDB(step);
 
@@ -3767,10 +3767,10 @@ runBug44952(NDBT_Context* ctx, NDBT_Step
 
   const int codes [] = {
     5051, 5052, 5053, 0
-  };
+  }; (void)codes;
 
-  int randomId = myRandom48(res.getNumDbNodes());
-  int nodeId = res.getDbNodeId(randomId);
+  //int randomId = myRandom48(res.getNumDbNodes());
+  //int nodeId = res.getDbNodeId(randomId);
 
   int loops = ctx->getNumLoops();
   const int val[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 } ;

=== modified file 'storage/ndb/test/ndbapi/testReadPerf.cpp'
--- a/storage/ndb/test/ndbapi/testReadPerf.cpp	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/test/ndbapi/testReadPerf.cpp	2011-04-07 07:22:49 +0000
@@ -138,7 +138,7 @@ main(int argc, const char** argv){
   for(i = optind; i<argc; i++){
     const char * T = argv[i];
     g_info << "Testing " << T << endl;
-    BaseString::snprintf(g_table, sizeof(g_table), T);
+    BaseString::snprintf(g_table, sizeof(g_table), "%s", T);
     BaseString::snprintf(g_ordered, sizeof(g_ordered), "IDX_O_%s", T);
     BaseString::snprintf(g_unique, sizeof(g_unique), "IDX_U_%s", T);
     if(create_table())
@@ -254,9 +254,9 @@ void err(NdbError e){
 
 int
 run_read(){
-  int iter = g_paramters[P_LOOPS].value;
+  //int iter = g_paramters[P_LOOPS].value;
   NDB_TICKS start1, stop;
-  int sum_time= 0;
+  //int sum_time= 0;
   
   const Uint32 rows = g_paramters[P_ROWS].value;
   const Uint32 range = g_paramters[P_RANGE].value;

=== modified file 'storage/ndb/test/ndbapi/testSRBank.cpp'
--- a/storage/ndb/test/ndbapi/testSRBank.cpp	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/test/ndbapi/testSRBank.cpp	2011-04-07 07:22:49 +0000
@@ -81,7 +81,7 @@ int runBankTransactions(NDBT_Context* ct
     Bank bank(ctx->m_cluster_connection);
     while(!ctx->isTestStopped() && 
           ctx->getProperty(NMR_SR) <= NdbMixRestarter::SR_STOPPING)
-      if(bank.performTransactions(0, 1) == NDBT_FAILED)
+      if(bank.performTransactions(wait, yield) == NDBT_FAILED)
 	break;
     
     ndbout_c("runBankTransactions is stopped");
@@ -94,7 +94,7 @@ int runBankTransactions(NDBT_Context* ct
 
 int runBankGL(NDBT_Context* ctx, NDBT_Step* step){
   int yield = 1; // Loops before bank returns 
-  int result = NDBT_OK;
+  //int result = NDBT_OK;
   
   ctx->incProperty(NMR_SR_THREADS);
   while (ctx->isTestStopped() == false) 
@@ -179,7 +179,7 @@ int runBankSum(NDBT_Context* ctx, NDBT_S
 int
 runMixRestart(NDBT_Context* ctx, NDBT_Step* step)
 {
-  int result = NDBT_OK;
+  //int result = NDBT_OK;
   NdbMixRestarter res;
   int runtime = ctx->getNumLoops();
   int sleeptime = ctx->getNumRecords();

=== modified file 'storage/ndb/test/ndbapi/testScan.cpp'
--- a/storage/ndb/test/ndbapi/testScan.cpp	2011-04-05 09:12:21 +0000
+++ b/storage/ndb/test/ndbapi/testScan.cpp	2011-04-07 07:22:49 +0000
@@ -626,7 +626,7 @@ int runScanUpdate(NDBT_Context* ctx, NDB
 }
 
 int runScanUpdateUntilStopped(NDBT_Context* ctx, NDBT_Step* step){
-  int records = ctx->getNumRecords();
+  //int records = ctx->getNumRecords();
   int i = 0;
 
   int parallelism = ctx->getProperty("Parallelism", 240);
@@ -1109,8 +1109,8 @@ runScanParallelism(NDBT_Context* ctx, ND
 int
 runScanVariants(NDBT_Context* ctx, NDBT_Step* step)
 {
-  int loops = ctx->getNumLoops();
-  int records = ctx->getNumRecords();
+  //int loops = ctx->getNumLoops();
+  //int records = ctx->getNumRecords();
   Ndb * pNdb = GETNDB(step);
   const NdbDictionary::Table*  pTab = ctx->getTab();
   
@@ -1176,7 +1176,7 @@ runScanVariants(NDBT_Context* ctx, NDBT_
 	    }
 	    
 	    int res;
-	    int row = 0;
+	    //int row = 0;
 	    while((res = pOp->nextResult()) == 0);
 	  }
 	  pCon->close();
@@ -1247,7 +1247,7 @@ runBug24447(NDBT_Context* ctx, NDBT_Step
       return NDBT_FAILED;
     }
 
-    for (Uint32 j = 0; i<10; i++)
+    for (Uint32 j = 0; j<10; j++)
     {
       hugoTrans.scanReadRecords(GETNDB(step), records, abort, 0, 
 				NdbOperation::LM_CommittedRead);

=== modified file 'storage/ndb/test/ndbapi/testScanPerf.cpp'
--- a/storage/ndb/test/ndbapi/testScanPerf.cpp	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/test/ndbapi/testScanPerf.cpp	2011-04-07 07:22:49 +0000
@@ -125,7 +125,7 @@ main(int argc, const char** argv){
   for(i = optind; i<argc; i++){
     const char * T = argv[i];
     g_info << "Testing " << T << endl;
-    BaseString::snprintf(g_tablename, sizeof(g_tablename), T);
+    BaseString::snprintf(g_tablename, sizeof(g_tablename), "%s", T);
     BaseString::snprintf(g_indexname, sizeof(g_indexname), "IDX_%s", T);
     if(create_table())
       goto error;

=== modified file 'storage/ndb/test/ndbapi/testTimeout.cpp'
--- a/storage/ndb/test/ndbapi/testTimeout.cpp	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/test/ndbapi/testTimeout.cpp	2011-04-07 07:22:49 +0000
@@ -500,8 +500,8 @@ int runScanRefreshNoTimeout(NDBT_Context
 int 
 runError4012(NDBT_Context* ctx, NDBT_Step* step){
   int result = NDBT_OK;
-  int loops = ctx->getNumLoops();
-  int stepNo = step->getStepNo();
+  //int loops = ctx->getNumLoops();
+  //int stepNo = step->getStepNo();
   
   int timeout = ctx->getProperty("TransactionDeadlockTimeout", TIMEOUT);
 

=== modified file 'storage/ndb/test/ndbapi/test_event.cpp'
--- a/storage/ndb/test/ndbapi/test_event.cpp	2011-02-21 14:10:20 +0000
+++ b/storage/ndb/test/ndbapi/test_event.cpp	2011-04-07 07:22:49 +0000
@@ -904,7 +904,7 @@ int runEventConsumer(NDBT_Context* ctx, 
 
   while(!ctx->isTestStopped())
   {
-    int count= 0;
+    //int count= 0;
     Ndb* ndb= GETNDB(step);
 
     Uint64 last_gci = 0;
@@ -1003,7 +1003,7 @@ end:
 
 int runRestarter(NDBT_Context* ctx, NDBT_Step* step){
   int result = NDBT_OK;
-  int loops = ctx->getNumLoops();
+  //int loops = ctx->getNumLoops();
   NdbRestarter restarter;
   int i = 0;
   int lastId = 0;
@@ -1903,7 +1903,7 @@ runLoadTable(NDBT_Context* ctx, NDBT_Ste
 
 int 
 runScanUpdateUntilStopped(NDBT_Context* ctx, NDBT_Step* step){
-  int records = ctx->getNumRecords();
+  //int records = ctx->getNumRecords();
   int parallelism = ctx->getProperty("Parallelism", (Uint32)0);
   int abort = ctx->getProperty("AbortProb", (Uint32)0);
   HugoTransactions hugoTrans(*ctx->getTab());
@@ -1920,7 +1920,7 @@ runScanUpdateUntilStopped(NDBT_Context* 
 int 
 runInsertDeleteUntilStopped(NDBT_Context* ctx, NDBT_Step* step)
 {
-  int result = NDBT_OK;
+  //int result = NDBT_OK;
   int records = ctx->getNumRecords();
   HugoTransactions hugoTrans(*ctx->getTab());
   UtilTransactions utilTrans(*ctx->getTab());
@@ -1940,7 +1940,7 @@ runInsertDeleteUntilStopped(NDBT_Context
 int 
 runBug31701(NDBT_Context* ctx, NDBT_Step* step)
 {
-  int result = NDBT_OK;
+  //int result = NDBT_OK;
 
   NdbRestarter restarter;
 
@@ -2189,7 +2189,7 @@ cleanup:
 int 
 runBug33793(NDBT_Context* ctx, NDBT_Step* step)
 {
-  int result = NDBT_OK;
+  //int result = NDBT_OK;
   int loops = ctx->getNumLoops();
 
   NdbRestarter restarter;
@@ -2305,10 +2305,10 @@ op(Ndb* xndb, const NdbDictionary::Table
 int
 runBug34853(NDBT_Context* ctx, NDBT_Step* step)
 {
-  int result = NDBT_OK;
-  int loops = ctx->getNumLoops();
-  int records = ctx->getNumRecords();
-  Ndb* pNdb = GETNDB(step);
+  //int result = NDBT_OK;
+  //int loops = ctx->getNumLoops();
+  //int records = ctx->getNumRecords();
+  //Ndb* pNdb = GETNDB(step);
   NdbRestarter res;
 
   if (res.getNumDbNodes() < 2)
@@ -2698,7 +2698,7 @@ runBug37279(NDBT_Context* ctx, NDBT_Step
   NdbDictionary::Dictionary* dict = pNdb->getDictionary();
   
   const NdbDictionary::Table* tab = dict->getTable(ctx->getTab()->getName());
-  const NdbDictionary::Table* org = tab;
+  //const NdbDictionary::Table* org = tab;
   NdbEventOperation* pOp0 = createEventOperation(pNdb, *tab);
   
   if (pOp0 == 0)
@@ -3199,7 +3199,7 @@ runBug37672(NDBT_Context* ctx, NDBT_Step
 int
 runBug30780(NDBT_Context* ctx, NDBT_Step* step)
 {
-  int result = NDBT_OK;
+  //int result = NDBT_OK;
 
   NdbRestarter res;
 

=== modified file 'storage/ndb/test/src/HugoOperations.cpp'
--- a/storage/ndb/test/src/HugoOperations.cpp	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/test/src/HugoOperations.cpp	2011-04-07 07:22:49 +0000
@@ -1122,6 +1122,7 @@ HugoOperations::releaseLockHandles(Ndb* 
         return NDBT_FAILED;
       }
       const NdbLockHandle* nullPtr = NULL;
+      (void)nullPtr; // ??
       //lockHandles.set(nullPtr, offset + i, nullPtr);
     }
     else

=== modified file 'storage/ndb/test/tools/verify_index.cpp'
--- a/storage/ndb/test/tools/verify_index.cpp	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/test/tools/verify_index.cpp	2011-04-07 07:22:49 +0000
@@ -78,7 +78,6 @@ int main(int argc, const char** argv){
     return NDBT_ProgramExit(NDBT_FAILED);
   }
 
-  int rows = 0;
   UtilTransactions utilTrans(*pTab);
   if (utilTrans.verifyIndex(&MyNdb, 
 			    _indexname, 

=== modified file 'storage/ndb/tools/ndb_test_platform.cpp'
--- a/storage/ndb/tools/ndb_test_platform.cpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/tools/ndb_test_platform.cpp	2011-04-07 07:22:49 +0000
@@ -28,7 +28,7 @@ int test_snprintf(const char * fmt, int 
 {
   int ret;
   char buf[100];
-  ret = BaseString::snprintf(buf, buf_sz, fmt);
+  ret = BaseString::snprintf(buf, buf_sz, "%s", fmt);
   
   if(ret < 0)
   {

=== modified file 'support-files/compiler_warnings.supp'
--- a/support-files/compiler_warnings.supp	2010-10-15 09:47:39 +0000
+++ b/support-files/compiler_warnings.supp	2011-04-07 07:56:31 +0000
@@ -112,3 +112,5 @@ btr/btr0cur.c : .*
 # Ignore warning C4090 on Windows, until bug#55527 is fixed
 .* : .*C4090.*
 
+# newly introduce windows warning (5.1.53) bug#56423
+sql_update.cc : conversion from '__int64' to 'uchar'.*

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0 branch (jonas:4288 to 4291) Jonas Oreland7 Apr