bk commit into 5.1 tree (jmiller:1.2513) BUG#28770

[Jonathan Miller]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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-05-31 13:23:16+02:00, jmiller@stripped +2 -0
  Dbdict.cpp:
    Added ERROR_INSERT to Dbdict to fake the block out that a read on table file 1 has failed. This is to ensure that Dbdict does the right thing in closing file 1 before it tries to open file 2. This is associated with Bug#28770
  ERROR_codes.txt:
    Added new error (6100) for ERROR_INSERT to Dbdict to fake the block out that a read on table file 1 has failed. This is associated with Bug#28770

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@stripped, 2007-05-31 13:23:05+02:00, jmiller@stripped +1 -0
    Added new error (6100) for ERROR_INSERT to Dbdict to fake the block out that a read on table file 1 has failed. This is associated with Bug#28770

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2007-05-31 13:21:49+02:00, jmiller@stripped +6 -0
    Added ERROR_INSERT to Dbdict to fake the block out that a read on table file 1 has failed. This is to ensure that Dbdict does the right thing in closing file 1 before it tries to open file 2. This is associated with Bug#28770

# 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:	jmiller
# Host:	ndb08.mysql.com
# Root:	/data1/mysql-5.1-telco3

--- 1.42/storage/ndb/src/kernel/blocks/ERROR_codes.txt	2007-05-31 13:23:28 +02:00
+++ 1.43/storage/ndb/src/kernel/blocks/ERROR_codes.txt	2007-05-31 13:23:28 +02:00
@@ -503,6 +503,7 @@
 6003 Crash in participant @ CreateTabReq::Prepare
 6004 Crash in participant @ CreateTabReq::Commit
 6005 Crash in participant @ CreateTabReq::CreateDrop
+6100 Fail on readTableFile for READ_TAB_FILE1
 
 Dbtup:
 4014 - handleInsert - Out of undo buffer

--- 1.136/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2007-05-31 13:23:28 +02:00
+++ 1.137/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2007-05-31 13:23:28 +02:00
@@ -801,6 +801,12 @@
     readSchemaConf(signal ,fsPtr);
     break;
   case FsConnectRecord::READ_TAB_FILE1:
+    if(ERROR_INSERTED(6100)){
+      jam();
+      execFSREADREF(signal);
+      CLEAR_ERROR_INSERT_VALUE;     
+      return;
+    }//Testing how DICT behave if read of file 1 fails (Bug#28770)
   case FsConnectRecord::READ_TAB_FILE2:
     jam();
     readTableConf(signal ,fsPtr);