bk commit into 5.1 tree (jonas:1.2083) BUG#16495

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2083 06/01/27 15:09:07 jonas@stripped +1 -0
  bug#16495 - ndb dd - dict ref count was not correctly set after SR

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.70 06/01/27 15:09:04 jonas@stripped +24 -8
    Add dump for object/ref count
    Fix ref count on SR

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-new

--- 1.69/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-01-23 09:57:01 +01:00
+++ 1.70/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-01-27 15:09:04 +01:00
@@ -286,6 +286,20 @@
     MEMINFO("c_opRecordPool", c_opRecordPool);
     MEMINFO("c_rope_pool", c_rope_pool);
   }
+
+  if (signal->theData[0] == 1227)
+  {
+    DLHashTable<DictObject>::Iterator iter;
+    bool ok = c_obj_hash.first(iter);
+    for(; ok; ok = c_obj_hash.next(iter))
+    {
+      Rope name(c_rope_pool, iter.curr.p->m_name);
+      const Uint32 size = name.size();
+      char buf[1024];
+      name.copy(buf);
+      ndbout_c("%s m_ref_count: %d", buf, iter.curr.p->m_ref_count); 
+    }
+  }    
   
   return;
 }//Dbdict::execDUMP_STATE_ORD()
@@ -5080,13 +5094,6 @@
     safe_cast(&Dbdict::createTab_writeSchemaConf1);
   
   updateSchemaState(signal, tableId, &tabEntry, &callback);
-
-  if (tabPtr.p->m_tablespace_id != RNIL)
-  {
-    FilegroupPtr ptr;
-    ndbrequire(c_filegroup_hash.find(ptr, tabPtr.p->m_tablespace_id));
-    increase_ref_count(ptr.p->m_obj_ptr_i);
-  }
 }
 
 void getSection(SegmentedSectionPtr & ptr, Uint32 i);
@@ -6231,7 +6238,16 @@
     {
       tabRequire(false, CreateTableRef::InvalidTablespaceVersion);
     }
-  } 
+
+    {
+      /**
+       * Increase ref count
+       */
+      FilegroupPtr ptr;
+      ndbrequire(c_filegroup_hash.find(ptr, tablePtr.p->m_tablespace_id));
+      increase_ref_count(ptr.p->m_obj_ptr_i);
+    }
+  }
 }//handleTabInfo()