From: Date: November 3 2006 9:05am
Subject: bk commit into 5.1 tree (stewart:1.2338) BUG#20065
List-Archive: http://lists.mysql.com/commits/14787
X-Bug: 20065
Message-Id: <20061103080515.E5D1714757A2@localhost.localdomain>

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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-03 19:05:09+11:00, stewart@willster.(none) +1 -0
  BUG#20065 Erroneous error message at Node Restart if MaxNoOfOrderedIndexes changed too low
  
  nicer error message to user, along with error code to help track down the problem.

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2006-11-03 19:05:06+11:00, stewart@willster.(none) +9 -3
    Report error when creating table (restartCreateTab_dihComplete) 
    to user in a nicer way.

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/ndb-mgm-work

--- 1.104/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-10-18 18:47:19 +10:00
+++ 1.105/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-11-03 19:05:06 +11:00
@@ -3248,9 +3248,15 @@
   
   CreateTableRecordPtr createTabPtr;  
   ndbrequire(c_opCreateTable.find(createTabPtr, callbackData));
-  
-  //@todo check error
-  ndbrequire(createTabPtr.p->m_errorCode == 0);
+
+  if(createTabPtr.p->m_errorCode)
+  {
+    char buf[100];
+    BaseString::snprintf(buf, sizeof(buf), "Failed to create table during"
+                         " restart, Error: %u",
+                         createTabPtr.p->m_errorCode);
+    progError(__LINE__, NDBD_EXIT_RESOURCE_ALLOC_ERROR, buf);
+  }
 
   Callback callback;
   callback.m_callbackData = callbackData;