Commit d3357e2c authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/50-work 

into  perch.ndb.mysql.com:/home/jonas/src/51-new


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
parents 6e8b3484 979c824e

storage/ndb/src/kernel/blocks/ERROR_codes.txt

+3 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ Next NDBCNTR 1000 
Next NDBFS 2000

Next DBACC 3002

Next DBTUP 4013

Next DBLQH 5042

Next DBLQH 5043

Next DBDICT 6007

Next DBDIH 7174

Next DBTC 8037
@@ -314,6 +314,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

----------------------------------

storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

+9 −0
Original line number Diff line number Diff line
@@ -9255,6 +9255,15 @@ void Dblqh::nextScanConfCopyLab(Signal* signal) 
// 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