From: Date: February 28 2007 3:35am
Subject: bk commit into 5.1 tree (gni:1.2437) BUG#25992
List-Archive: http://lists.mysql.com/commits/20721
X-Bug: 25992
Message-Id: <200702280235.l1S2Z64R011023@dev3-221.dev.cn.tlan>

Below is the list of changes that have just been committed into a local
5.1 repository of root. When root 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@stripped, 2007-02-28 10:34:58+08:00, gni@stripped +1 -0
  BUG#25992 Data nodes died during creating many tables based on different tablespaces.

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2007-02-28 10:34:55+08:00, gni@stripped +16 -0
    Because TableSpaces, Datafiles, Undofiles and LogfileGroups uses the same id-space with Tables,
    when they are created, the objId allocated for them must also be less than c_tableRecordPool.getSize().

# 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:	gni
# Host:	dev3-221.dev.cn.tlan
# Root:	/home/ngb/mysql/mysql-5.1/mysql-5.1-bug25992

--- 1.114/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2007-02-28 10:35:06 +08:00
+++ 1.115/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2007-02-28 10:35:06 +08:00
@@ -14097,6 +14097,14 @@
         ref->errorLine = __LINE__;
         break;
       }
+
+      if (objId >= c_tableRecordPool.getSize()) {
+        ref->errorCode = CreateTableRef::NoMoreTableRecords;
+        ref->status    = 0;
+        ref->errorKey  = 0;
+        ref->errorLine = __LINE__;
+        break;
+      }
       
       create_obj->objId = objId;
       trans_ptr.p->m_op.m_obj_id = objId;
@@ -14199,6 +14207,14 @@
         ref->errorLine = __LINE__;
         break;
       }
+
+      if (objId >= c_tableRecordPool.getSize()) {
+        ref->errorCode = CreateTableRef::NoMoreTableRecords; 
+        ref->status    = 0; 
+        ref->errorKey  = 0; 
+        ref->errorLine = __LINE__; 
+        break; 
+      } 
       
       create_obj->objId = objId;
       trans_ptr.p->m_op.m_obj_id = objId;