List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:May 30 2011 9:07am
Subject:bzr push into mysql-5.1-telco-7.0 branch (jonas:4426 to 4427)
View as plain text  
 4427 Jonas Oreland	2011-05-30
      ndb - kill warnings for gcc 4.4.3

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
      storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
      storage/ndb/src/kernel/blocks/suma/Suma.cpp
 4426 jonas oreland	2011-05-27
      ndb - move refresh tests into daily-basic...as daily-devel isn't closely monitored

    modified:
      storage/ndb/test/run-test/daily-basic-tests.txt
      storage/ndb/test/run-test/daily-devel-tests.txt
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2011-05-27 06:15:17 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2011-05-30 08:50:17 +0000
@@ -4365,8 +4365,8 @@ void Dblqh::execLQHKEYREQ(Signal* signal
 
   {
     const NodeBitmask& all = globalTransporterRegistry.get_status_overloaded();
-    if (unlikely(!all.isclear() &&
-                 checkTransporterOverloaded(signal, all, lqhKeyReq)) ||
+    if (unlikely((!all.isclear() &&
+                  checkTransporterOverloaded(signal, all, lqhKeyReq))) ||
         ERROR_INSERTED_CLEAR(5047)) {
       jam();
       releaseSections(handle);

=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2011-05-26 11:52:38 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2011-05-30 08:50:17 +0000
@@ -5118,9 +5118,6 @@ void Dbtc::linkApiToGcp(Ptr<GcpRecord> r
 void
 Dbtc::crash_gcp(Uint32 line)
 {
-  UintR Tfirstgcp = cfirstgcp;
-  UintR TgcpFilesize = cgcpFilesize;
-  GcpRecord *localGcpRecord = gcpRecord;
   GcpRecordPtr localGcpPointer;
 
   localGcpPointer.i = cfirstgcp;
@@ -7802,10 +7799,10 @@ void Dbtc::sendAbortedAfterTimeout(Signa
 	for(Uint32 i = 0; i<TloopCount; i++)
 	{
 	  BaseString::snprintf(buf2, sizeof(buf2), "%s %d", buf, tmp[i]);
-	  BaseString::snprintf(buf, sizeof(buf), buf2);
+	  BaseString::snprintf(buf, sizeof(buf), "%s", buf2);
 	}
-	warningEvent(buf);
-	ndbout_c(buf);
+	warningEvent("%s", buf);
+	ndbout_c("%s", buf);
 	ndbrequire(false);
 	releaseAbortResources(signal);
 	return;
@@ -13438,7 +13435,7 @@ Dbtc::match_and_print(Signal* signal, Ap
 		       apiTimer ? (ctcTimer - apiTimer) / 100 : 0,
 		       c_apiConTimer_line[apiPtr.i],
 		       stateptr);
-  infoEvent(buf);
+  infoEvent("%s", buf);
   
   memcpy(signal->theData, temp, 4*len);
   return true;

=== modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2011-05-25 14:31:47 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2011-05-30 08:50:17 +0000
@@ -866,7 +866,9 @@ skip_disk:
     {
       jam();
       if (get_page)
+      {
         ndbassert(tuple_ptr->m_header_bits & Tuple_header::DISK_PART);
+      }
       dealloc_tuple(signal, gci_hi, gci_lo, page.p, tuple_ptr,
                     &req_struct, regOperPtr.p, regFragPtr.p, regTabPtr.p);
     }

=== modified file 'storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp	2011-05-17 12:19:20 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp	2011-05-30 08:50:17 +0000
@@ -333,8 +333,8 @@ Dbtux::printNode(TuxCtx & ctx,
     int ret = cmpSearchKey(ctx, entryKey1, entryKey2, index.m_numAttrs);
     if (ret == 0)
       ret = ent1.cmp(ent2);
-    if (i == 0 && ! (ret < 0) ||
-        i == 1 && ! (ret > 0)) {
+    if ((i == 0 && ! (ret < 0)) ||
+        (i == 1 && ! (ret > 0))) {
       par.m_ok = false;
       out << par.m_path << sep;
       out << " disorder wrt subtree " << i << endl;

=== modified file 'storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp	2011-05-17 12:19:20 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp	2011-05-30 08:50:17 +0000
@@ -270,7 +270,7 @@ Dbtux::readKeyAttrs(TuxCtx& ctx, const F
   const Uint32* keyAttrs32 = (const Uint32*)&keyAttrs[0];
 
   int ret;
-  ret = c_tup->tuxReadAttrs(ctx.jamBuffer, tableFragPtrI, tupLoc.getPageId(), tupLoc.getPageOffset(), tupVersion, keyAttrs32, count, outputBuffer, false);
+  ret = c_tup->tuxReadAttrs(ctx.jamBuffer, tableFragPtrI, pageId, pageOffset, tupVersion, keyAttrs32, count, outputBuffer, false);
   jamEntry();
   ndbrequire(ret > 0);
   keyData.reset();

=== modified file 'storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp	2011-05-17 12:19:20 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp	2011-05-30 08:50:17 +0000
@@ -146,8 +146,8 @@ Dbtux::execTUX_BOUND_INFO(Signal* signal
   TuxBoundInfo* const req = (TuxBoundInfo*)signal->getDataPtrSend();
   ScanOp& scan = *c_scanOpPool.getPtr(req->tuxScanPtrI);
   const Index& index = *c_indexPool.getPtr(scan.m_indexId);
-  const DescHead& descHead = getDescHead(index);
-  const KeyType* keyTypes = getKeyTypes(descHead);
+  //UNUSED const DescHead& descHead = getDescHead(index);
+  //UNUSED const KeyType* keyTypes = getKeyTypes(descHead);
   // extract lower and upper bound in separate passes
   for (unsigned idir = 0; idir <= 1; idir++) {
     jam();

=== modified file 'storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp'
--- a/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp	2011-02-03 14:20:36 +0000
+++ b/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp	2011-05-30 08:50:17 +0000
@@ -354,7 +354,7 @@ DbUtil::execTCSEIZECONF(Signal* signal){
 void
 DbUtil::execCONTINUEB(Signal* signal){
   jamEntry();
-  const Uint32 Tdata0 = signal->theData[0];
+  //const Uint32 Tdata0 = signal->theData[0];
 
   ndbrequire(0);
 }

=== modified file 'storage/ndb/src/kernel/blocks/suma/Suma.cpp'
--- a/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2011-05-25 14:31:47 +0000
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2011-05-30 08:50:17 +0000
@@ -2708,7 +2708,7 @@ Suma::SyncRecord::nextScan(Signal* signa
   
   ScanFragReq * req = (ScanFragReq *)signal->getDataPtrSend();
   const Uint32 parallelism = 16;
-  const Uint32 attrLen = 5 + attrBuf.getSize();
+  //const Uint32 attrLen = 5 + attrBuf.getSize();
 
   req->senderData = ptrI;
   req->resultRef = suma.reference();

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0 branch (jonas:4426 to 4427) Jonas Oreland31 May