bzr commit into mysql-5.1-telco-7.0 branch (jonas:4196)

[jonas oreland]

#At file:///home/jonas/src/telco-7.0/ based on revid:jonas@stripped

 4196 jonas oreland	2011-02-15
      ndb - fix embarrasing bug with uninitialized  startFragReq->requestInfo during sr

    modified:
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2011-02-15 13:06:21 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2011-02-15 13:49:23 +0000
@@ -11985,7 +11985,7 @@ void Dbdih::startFragment(Signal* signal
     BaseString::snprintf(buf, sizeof(buf), "table: %d fragment: %d gci: %d",
 			 tableId, fragId, SYSFILE->newestRestorableGCI);
 
-    ndbout_c(buf);
+    ndbout_c("%s", buf);
     dump_replica_info();
     
     progError(__LINE__, NDBD_EXIT_NO_RESTORABLE_REPLICA, buf);
@@ -16618,6 +16618,7 @@ void Dbdih::sendStartFragreq(Signal* sig
     startFragReq->lcpId = replicaPtr.p->createLcpId;
     startFragReq->tableId = tabPtr.i;
     startFragReq->fragId = fragId;
+    startFragReq->requestInfo = StartFragReq::SFR_RESTORE_LCP;
 
     if(ERROR_INSERTED(7072) || ERROR_INSERTED(7074)){
       jam();
@@ -17177,7 +17178,7 @@ Dbdih::execDUMP_STATE_ORD(Signal* signal
 	  BaseString::snprintf(tmp, sizeof(tmp), "%d ", nodeOrder[k]);
 	  strcat(buf, tmp);
 	}
-	infoEvent(buf);
+	infoEvent("%s", buf);
       }
     }
   }
@@ -17556,7 +17557,7 @@ Dbdih::execDUMP_STATE_ORD(Signal* signal
 	num++;
 	replicaPtr.i = replicaPtr.p->nextReplica;
       } while (replicaPtr.i != RNIL);
-      infoEvent(buf);
+      infoEvent("%s", buf);
     }
   }
 


Attachment: [text/bzr-bundle] bzr/[e-mail]