Commit c251e8a8 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/mysql-5.0-ndb


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
parents 91c28daf 4eb44935

BUILD/compile-ndb-autotest

0 → 100755
+19 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



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"

ndb/include/ndbapi/NdbOperation.hpp

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,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.

ndb/src/kernel/blocks/ERROR_codes.txt

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

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

-----

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

+16 −5
Original line number Diff line number Diff line
@@ -8252,11 +8252,21 @@ void Dbdih::openingTableErrorLab(Signal* signal, FileRecordPtr filePtr) 
  /*    WE FAILED IN OPENING A FILE. IF THE FIRST FILE THEN TRY WITH THE    */

  /*    DUPLICATE FILE, OTHERWISE WE REPORT AN ERROR IN THE SYSTEM RESTART. */

  /* ---------------------------------------------------------------------- */

  ndbrequire(filePtr.i == tabPtr.p->tabFile[0]);

  if (filePtr.i == tabPtr.p->tabFile[0])

  {

    filePtr.i = tabPtr.p->tabFile[1];

    ptrCheckGuard(filePtr, cfileFileSize, fileRecord);

    openFileRw(signal, filePtr);

    filePtr.p->reqStatus = FileRecord::OPENING_TABLE;

  }

  else

  {

    char buf[256];

    BaseString::snprintf(buf, sizeof(buf),

			 "Error opening DIH schema files for table: %d",

			 tabPtr.i);

    progError(__LINE__, NDBD_EXIT_AFS_NO_SUCH_FILE, buf);

  }

}//Dbdih::openingTableErrorLab()



void Dbdih::readingTableLab(Signal* signal, FileRecordPtr filePtr)
@@ -8422,6 +8432,7 @@ Dbdih::resetReplicaSr(TabRecordPtr tabPtr){ 
      }

      replicaPtr.i = nextReplicaPtrI;

    }//while

    updateNodeInfo(fragPtr);

  }

}

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

+2 −3
Original line number Diff line number Diff line
@@ -6470,6 +6470,7 @@ void Dblqh::execACC_ABORTCONF(Signal* signal) 
     * A NORMAL EVENT DURING CREATION OF A FRAGMENT. WE NOW NEED TO CONTINUE

     * WITH NORMAL COMMIT PROCESSING.

     * ---------------------------------------------------------------------- */

    regTcPtr->totSendlenAi = regTcPtr->totReclenAi;

    if (regTcPtr->currTupAiLen == regTcPtr->totReclenAi) {

      jam();

      regTcPtr->abortState = TcConnectionrec::ABORT_IDLE;
@@ -12579,19 +12580,17 @@ void Dblqh::lastWriteInFileLab(Signal* signal) 








void Dblqh::writePageZeroLab(Signal* signal) 









{









  if (false && logPartPtr.p->logPartState == LogPartRecord::FILE_CHANGE_PROBLEM) 









  if (logPartPtr.p->logPartState == LogPartRecord::FILE_CHANGE_PROBLEM) 









  {









    if (logPartPtr.p->firstLogQueue == RNIL) 









    {









      jam();









      logPartPtr.p->logPartState = LogPartRecord::IDLE;









      ndbout_c("resetting logPartState to IDLE");









    } 









    else 









    {









      jam();









      logPartPtr.p->logPartState = LogPartRecord::ACTIVE;









      ndbout_c("resetting logPartState to ACTIVE");









    }









  }