From: Date: November 14 2006 2:33am
Subject: bk commit into 5.1 tree (Justin.He:1.2320) BUG#19808
List-Archive: http://lists.mysql.com/commits/15280
X-Bug: 19808
Message-Id: <200611140133.kAE1XrpO009587@dev3-47.dev.cn.tlan>

Below is the list of changes that have just been committed into a local
5.1 repository of justin.he. When justin.he 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, 2006-11-14 09:33:43+08:00, Justin.He@stripped +1 -0
  BUG#19808, Online config. Wrong error message if DataMemory less than a data on cluster

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2006-11-14 09:33:40+08:00, Justin.He@stripped +14 -2
    add err message when error occur

# 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:	Justin.He
# Host:	dev3-47.dev.cn.tlan
# Root:	/mnt/sda7/justin.he/mysql/mysql-5.1/bug19808-5.1-new-ndb-bj

--- 1.103/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-11-14 09:33:53 +08:00
+++ 1.104/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-11-14 09:33:53 +08:00
@@ -3249,8 +3249,20 @@
   CreateTableRecordPtr createTabPtr;  
   ndbrequire(c_opCreateTable.find(createTabPtr, callbackData));
   
-  //@todo check error
-  ndbrequire(createTabPtr.p->m_errorCode == 0);
+  fprintf(stderr,"Dbdict:restartCreateTab_dihComplete:, errorCode=%d\n", createTabPtr.p->m_errorCode);
+  if (createTabPtr.p->m_errorCode != 0)
+  {
+    char buf[255];
+    BaseString::snprintf(buf, sizeof(buf), 
+			 "Unable to restart, fail while creating table"
+			 " error: %d. Most likely change of configuration",
+			 createTabPtr.p->m_errorCode);
+    progError(__LINE__, 
+	      NDBD_EXIT_INVALID_CONFIG,
+	      buf);
+    ndbrequire(createTabPtr.p->m_errorCode == 0);
+  }
+
 
   Callback callback;
   callback.m_callbackData = callbackData;