bk commit into 4.1 tree (jonas:1.2458) BUG#15908

[jonas]

Below is the list of changes that have just been committed into a local
4.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
  1.2458 05/12/21 16:31:58 jonas@stripped +2 -0
  bug#15908 - ndb 
    When scan is completed, but lqhkeyreq is outstanding on primary replica and
    starting node dies, scan will not be closed leading to error handling of failed
    node not completing

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.59 05/12/21 16:31:56 jonas@stripped +9 -0
    Set scan state to WAIT_LQHKEY_COPY when scan is finished but LQHKEYREQ is outstanding

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.13 05/12/21 16:31:56 jonas@stripped +3 -1
    New error code

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/41-work

--- 1.12/ndb/src/kernel/blocks/ERROR_codes.txt	2005-12-12 17:19:02 +01:00
+++ 1.13/ndb/src/kernel/blocks/ERROR_codes.txt	2005-12-21 16:31:56 +01:00
@@ -3,7 +3,7 @@
 Next NDBFS 2000
 Next DBACC 3002
 Next DBTUP 4013
-Next DBLQH 5042
+Next DBLQH 5043
 Next DBDICT 6006
 Next DBDIH 7174
 Next DBTC 8037
@@ -311,6 +311,8 @@
 LQH:
 5026  Crash when receiving COPY_ACTIVEREQ
 5027  Crash when receiving STAT_RECREQ
+
+5042  Crash starting node, when scan is finished on primary replica
 
 Test Crashes in handling take over
 ----------------------------------

--- 1.58/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2005-12-12 17:19:02 +01:00
+++ 1.59/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2005-12-21 16:31:56 +01:00
@@ -9220,6 +9220,15 @@
 // completion. Signal completion through scanCompletedStatus-flag.
 /*---------------------------------------------------------------------------*/
     scanptr.p->scanCompletedStatus = ZTRUE;
+    scanptr.p->scanState = ScanRecord::WAIT_LQHKEY_COPY;
+    if (ERROR_INSERTED(5042))
+    {
+      CLEAR_ERROR_INSERT_VALUE;
+      tcConnectptr.p->copyCountWords = ~0;
+      signal->theData[0] = 9999;
+      sendSignal(numberToRef(CMVMI, scanptr.p->scanNodeId),
+		 GSN_NDB_TAMPER, signal, 1, JBA);
+    }
     return;
   }//if