Commit be47bcec authored by unknown's avatar unknown
Browse files

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

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


mysql-test/lib/mtr_timer.pl:
  Auto merged
ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/Makefile.am:
  Auto merged
ndb/test/src/NdbRestarter.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge
ndb/src/ndbapi/Ndbif.cpp:
  merge
ndb/src/ndbapi/TransporterFacade.cpp:
  merge
ndb/test/ndbapi/testTimeout.cpp:
  merge
ndb/test/run-test/daily-basic-tests.txt:
  merge
ndb/tools/desc.cpp:
  merge
parents 4a02c193 2279f08a

mysql-test/lib/mtr_timer.pl

+6 −0
Original line number Diff line number Diff line
@@ -78,6 +78,12 @@ sub mtr_timer_start($$$) { 
    {

      # Child, redirect output and exec

      # FIXME do we need to redirect streams?



      # Don't do the ^C cleanup in the timeout child processes!

      # There is actually a race here, if we get ^C after fork(), but before

      # clearing the signal handler.

      $SIG{INT}= 'DEFAULT';



      $0= "mtr_timer(timers,$name,$duration)";

      sleep($duration);

      exit(0);

ndb/include/kernel/signaldata/DumpStateOrd.hpp

+4 −0
Original line number Diff line number Diff line
@@ -126,7 +126,11 @@ public: 
    DihAllAllowNodeStart = 7016,

    DihMinTimeBetweenLCP = 7017,

    DihMaxTimeBetweenLCP = 7018,

    // 7019

    // 7020

    // 7021

    EnableUndoDelayDataWrite = 7080, // DIH+ACC+TUP

    DihSetTimeBetweenGcp = 7090,

    DihStartLcpImmediately = 7099,

    // 8000 Suma

    // 12000 Tux

ndb/include/kernel/signaldata/StartPerm.hpp

+6 −0
Original line number Diff line number Diff line
@@ -64,5 +64,11 @@ private: 
  

  Uint32 startingNodeId;

  Uint32 errorCode;  



  enum ErrorCode

  {

    ZNODE_ALREADY_STARTING_ERROR = 305,

    InitialStartRequired = 320

  };

};

#endif

ndb/include/kernel/signaldata/TcContinueB.hpp

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ private: 
    CHECK_WAIT_DROP_TAB_FAILED_LQH         = 16,

    TRIGGER_PENDING                        = 17,

    

    DelayTCKEYCONF = 18

    DelayTCKEYCONF = 18,

    ZNF_CHECK_TRANSACTIONS = 19

  };

};

ndb/src/kernel/blocks/ERROR_codes.txt

+4 −0
Original line number Diff line number Diff line
@@ -228,6 +228,8 @@ Delay execution of COMPLETECONF signal 2 seconds to generate time-out. 
8045: (ABORTCONF only as part of take-over)

Delay execution of ABORTCONF signal 2 seconds to generate time-out.



8050: Send ZABORT_TIMEOUT_BREAK delayed



ERROR CODES FOR TESTING TIME-OUT HANDLING IN DBTC

-------------------------------------------------
@@ -305,6 +307,8 @@ Test Crashes in handling node restarts 
7131: Crash when receiving START_COPYREQ in master node

7132: Crash when receiving START_COPYCONF in starting node



7170: Crash when receiving START_PERMREF (InitialStartRequired)



DICT:

6000  Crash during NR when receiving DICTSTARTREQ

6001  Crash during NR when receiving SCHEMA_INFO