Commit abd3a43b 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-work


storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/ndb_logevent.cpp:
  Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
  Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
parents 5c484fd0 d0bd2688

BUILD/compile-ndb-autotest

+12 −2
Original line number Diff line number Diff line
@@ -3,7 +3,17 @@ 
path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$fast_cflags $max_cflags -g"

extra_configs="$max_configs --with-ndb-test --with-ndb-ccflags="-DERROR_INSERT""

extra_configs="$max_configs --with-ndb-test --with-ndb-ccflags='-DERROR_INSERT'"

if [ "$full_debug" ]

then

    extra_flags="$debug_cflags"

    c_warnings="$c_warnings $debug_extra_warnings"

    cxx_warnings="$cxx_warnings $debug_extra_warnings"

    extra_configs="$debug_configs $extra_configs"

else

    extra_flags="$fast_cflags"

fi



extra_flags="$extra_flags $max_cflags -g"



. "$path/FINISH.sh"

storage/ndb/include/ndbapi/NdbOperation.hpp

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ public: 


  /**

   * Interpreted program instruction:

   * Substract RegSource1 from RegSource2 and put the result in RegDest.

   * Substract RegSource2 from RegSource1 and put the result in RegDest.

   *

   * @param RegSource1   First register.

   * @param RegSource2   Second register.

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

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Next DBTUP 4024 
Next DBLQH 5045

Next DBDICT 6007

Next DBDIH 7177

Next DBTC 8037

Next DBTC 8038

Next CMVMI 9000

Next BACKUP 10022

Next DBUTIL 11002
@@ -283,6 +283,7 @@ ABORT OF TCKEYREQ 


8032: No free TC records any more



8037 : Invalid schema version in TCINDXREQ



CMVMI

-----

storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

+3 −2
Original line number Diff line number Diff line
@@ -8715,6 +8715,7 @@ Dbdih::resetReplicaSr(TabRecordPtr tabPtr){ 
      }

      replicaPtr.i = nextReplicaPtrI;

    }//while

    updateNodeInfo(fragPtr);

  }

}
































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



+1
−0






























Original line number
Diff line number
Diff line







@@ -7180,6 +7180,7 @@ void Dblqh::execACC_ABORTCONF(Signal* signal)







  signal->theData[0] = regTcPtr->tupConnectrec;









  EXECUTE_DIRECT(DBTUP, GSN_TUP_ABORTREQ, signal, 1);









  









  regTcPtr->totSendlenAi = regTcPtr->totReclenAi;









  continueAbortLab(signal);









  return;









}//Dblqh::execACC_ABORTCONF()