bk commit into 5.1 tree (jonas:1.2085)

[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.2085 06/01/27 15:58:00 jonas@stripped +2 -0
  ndb - fix compile error on sles9-x86

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
    1.8 06/01/27 15:57:57 jonas@stripped +12 -7
    Fix trick goto, getting compile error on some platforms

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.71 06/01/27 15:57:57 jonas@stripped +11 -9
    Fix ref counts wrt alter table

# 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.7/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp	2006-01-27 07:34:14 +01:00
+++ 1.8/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp	2006-01-27 15:57:57 +01:00
@@ -352,16 +352,21 @@
       while((pageBits= tsman.alloc_page_from_extent(&ext.p->m_key, bits)) < 0)
 	if(!list.next(ext) || ++cnt == 10)
 	  break;
-      ndbout_c("cnt: %d", cnt);
+
       if (cnt == 10 || ext.isNull())
-	goto alloc;
-      list.remove(ext);
-      alloc.m_curr_extent_info_ptr_i= ext.i;
-      ext.p->m_free_matrix_pos= RNIL;
+      {
+	pos = RNIL;
+      }
+      else
+      {
+	list.remove(ext);
+	alloc.m_curr_extent_info_ptr_i= ext.i;
+	ext.p->m_free_matrix_pos= RNIL;
+      }
     }
-    else
+
+    if (pos == RNIL)
     {
-  alloc:
       jam();
       /**
        * We need to alloc an extent

--- 1.70/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-01-27 15:09:04 +01:00
+++ 1.71/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-01-27 15:57:57 +01:00
@@ -5984,6 +5984,17 @@
      * Release table
      */
     releaseTableObject(tablePtr.i, checkExist);
+    return;
+  }
+
+  if (checkExist && tablePtr.p->m_tablespace_id != RNIL)
+  {
+    /**
+     * 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);
   }
 }//handleTabInfoInit()
 
@@ -6237,15 +6248,6 @@
     if(tablespacePtr.p->m_version != tableDesc.TablespaceVersion)
     {
       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()