bk commit into 5.1 tree (jonas:1.1987)

[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.1987 05/09/06 11:52:41 jonas@eel.(none) +1 -0
  ndb diskdata -
    fix uninit variable

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
    1.41 05/09/06 11:52:36 jonas@eel.(none) +13 -8
    make sure to init disk_alloc_info even if no disk attributes...

# 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:	eel.(none)
# Root:	/home/jonas/src/mysql-5.1-ndb-dd

--- 1.40/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp	2005-08-13 08:23:33 +02:00
+++ 1.41/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp	2005-09-06 11:52:36 +02:00
@@ -316,17 +316,16 @@
       /**
        * Init Disk_alloc_info
        */
+      CreateFilegroupImplReq rep;
       if(regTabPtr.p->m_no_of_disk_attributes)
       {
-	CreateFilegroupImplReq rep;
 	Tablespace_client tsman(0, c_tsman, 0, 0, 
 				regFragPtr.p->m_tablespace_id);
 	ndbrequire(tsman.get_tablespace_info(&rep) == 0);
 	regFragPtr.p->m_logfile_group_id= rep.tablespace.logfile_group_id;
-	
-	new (&regFragPtr.p->m_disk_alloc_info)
-	  Disk_alloc_info(regTabPtr.p, rep.tablespace.extent_size);
       }
+      new (&regFragPtr.p->m_disk_alloc_info)
+	Disk_alloc_info(regTabPtr.p, rep.tablespace.extent_size);
       releaseFragoperrec(fragOperPtr);      
     }
     return;
@@ -534,17 +533,20 @@
   }
 #endif
   
+  CreateFilegroupImplReq rep;
   if(regTabPtr.p->m_no_of_disk_attributes)
   {
-    CreateFilegroupImplReq rep;
     Tablespace_client tsman(0, c_tsman, 0, 0, 
 			    regFragPtr.p->m_tablespace_id);
     ndbrequire(tsman.get_tablespace_info(&rep) == 0);
     regFragPtr.p->m_logfile_group_id= rep.tablespace.logfile_group_id;
-    
-    new (&regFragPtr.p->m_disk_alloc_info)
-      Disk_alloc_info(regTabPtr.p, rep.tablespace.extent_size); 
+  }    
 
+  new (&regFragPtr.p->m_disk_alloc_info)
+    Disk_alloc_info(regTabPtr.p, rep.tablespace.extent_size); 
+  
+  if (regTabPtr.p->m_no_of_disk_attributes)
+  {
     if(!(getNodeState().getSystemRestartInProgress() && 
 	 getNodeState().startLevel == NodeState::SL_STARTING && 
 	 getNodeState().starting.startPhase <= 4))
@@ -556,6 +558,9 @@
       Uint32 sz= sizeof(Disk_undo::Create) >> 2;
       
       Logfile_client lgman(this, c_lgman, regFragPtr.p->m_logfile_group_id);
+      int r0 = c_lgman->alloc_log_space(regFragPtr.p->m_logfile_group_id,
+					sz);
+      
       int res= lgman.get_log_buffer(signal, sz, &cb);
       switch(res){
       case 0: