bzr push into mysql-5.1-telco-7.0 branch (jonas:2948 to 2949)

[Jonas Oreland]

 2949 Jonas Oreland	2009-03-15
      ndb - autotest - testDict -n FailAddPartition
modified:
  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

 2948 Jonas Oreland	2009-03-15 [merge]
      merge 63 to 64
modified:
  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp

=== modified file 'storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp	2009-03-14 20:42:04 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp	2009-03-15 13:33:49 +0000
@@ -1260,6 +1260,7 @@ private:
   Uint32 cfirstfreeReplica;
   Uint32 cnoFreeReplicaRec;
   Uint32 creplicaFileSize;
+  RSS_OP_SNAPSHOT(cnoFreeReplicaRec);
 
   TabRecord *tabRecord;
   Uint32 ctabFileSize;

=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2009-03-14 21:56:17 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2009-03-15 13:33:49 +0000
@@ -8171,6 +8171,9 @@ Dbdih::release_fragment_from_table(Ptr<T
   getFragstore(tabPtr.p, fragId, fragPtr);
   dec_ng_refcount(getNodeGroup(fragPtr.p->preferredPrimary));
 
+  releaseReplicas(fragPtr.p->storedReplicas);
+  releaseReplicas(fragPtr.p->oldStoredReplicas);
+
   if (fragId == ((chunks - 1) << LOG_NO_OF_FRAGS_PER_CHUNK))
   {
     jam();
@@ -16317,6 +16320,7 @@ Dbdih::execDUMP_STATE_ORD(Signal* signal
   if (arg == DumpStateOrd::SchemaResourceSnapshot)
   {
     RSS_OP_SNAPSHOT_SAVE(cremainingfrags);
+    RSS_OP_SNAPSHOT_SAVE(cnoFreeReplicaRec);
 
     {
       Uint32 cnghash = 0;
@@ -16335,6 +16339,7 @@ Dbdih::execDUMP_STATE_ORD(Signal* signal
   if (arg == DumpStateOrd::SchemaResourceCheckLeak)
   {
     RSS_OP_SNAPSHOT_CHECK(cremainingfrags);
+    RSS_OP_SNAPSHOT_SAVE(cnoFreeReplicaRec);
 
     {
       Uint32 cnghash = 0;