bk commit into 5.1 tree (jonas:1.2622)

[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@stripped, 2008-05-30 15:14:52+02:00, jonas@stripped +1 -0
  ndb -
    fix testDict -v -l 1 -n FailAddFragment T1

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2008-05-30 15:14:49+02:00, jonas@stripped +35 -5
    fix testDict -v -l 1 -n FailAddFragment T1

diff -Nrup a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2008-05-30 14:21:54 +02:00
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2008-05-30 15:14:49 +02:00
@@ -4113,7 +4113,6 @@ void Dbdict::handleTabInfoInit(SimplePro
     ndbrequire(false);
     break;
   }//switch
-  parseP->tablePtr = tablePtr;
   
   { 
     Rope name(c_rope_pool, tablePtr.p->tableName);
@@ -4138,6 +4137,7 @@ void Dbdict::handleTabInfoInit(SimplePro
 	     c_tableDesc.TableName, tablePtr.i, tablePtr.p->m_obj_ptr_i);
 #endif
   }
+  parseP->tablePtr = tablePtr;
   
   // Disallow logging of a temporary table.
   tabRequire(!(c_tableDesc.TableTemporaryFlag && c_tableDesc.TableLoggedFlag),
@@ -4662,8 +4662,26 @@ Dbdict::createTable_parse(Signal* signal
     handleTabInfoInit(r, &parseRecord);
     releaseSections(handle);
 
-    if (parseRecord.errorCode != 0) {
+    if (parseRecord.errorCode == 0)
+    {
+      if (ERROR_INSERTED(6200) || 
+          (ERROR_INSERTED(6201) && 
+           DictTabInfo::isIndex(parseRecord.tablePtr.p->tableType)))
+      {
+        jam();
+        CLEAR_ERROR_INSERT_VALUE;
+        parseRecord.errorCode = 1;
+      }
+    }
+
+    if (parseRecord.errorCode != 0) 
+    {
       jam();
+      if (!parseRecord.tablePtr.isNull())
+      {
+        jam();
+        releaseTableObject(parseRecord.tablePtr.i, true);
+      }
       setError(error, parseRecord);
       return;
     }
@@ -4725,9 +4743,21 @@ Dbdict::createTable_parse(Signal* signal
       tabPtr.p->primaryTableId = RNIL;
     }
 
-    EXECUTE_DIRECT(DBDICT, GSN_CREATE_FRAGMENTATION_REQ, signal,
-                   CreateFragmentationReq::SignalLength);
-    jamEntry();
+    if (ERROR_INSERTED(6202) || 
+        (ERROR_INSERTED(6203) && 
+         DictTabInfo::isIndex(parseRecord.tablePtr.p->tableType)))
+    {
+      jam();
+      CLEAR_ERROR_INSERT_VALUE;
+      signal->theData[0] = 1;
+    }
+    else
+    {
+      EXECUTE_DIRECT(DBDICT, GSN_CREATE_FRAGMENTATION_REQ, signal,
+                     CreateFragmentationReq::SignalLength);
+      jamEntry();
+    }
+
     if (signal->theData[0] != 0) {
       jam();
       setError(error, signal->theData[0], __LINE__);