Commit b11d2b6b authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-4.1 

into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
parents d646c270 7d225e6c

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

+1 −0
Original line number Diff line number Diff line
@@ -5072,6 +5072,7 @@ Dbdih::invalidateNodeLCP(Signal* signal, Uint32 nodeId, TabRecordPtr tabPtr) 
         * And reset nextLcp

         */

        replicaPtr.p->nextLcp = 0;

        replicaPtr.p->noCrashedReplicas = 0;

      }//if

    }//for

  }//for

ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp

+3 −0
Original line number Diff line number Diff line
@@ -133,6 +133,9 @@ void Dbtup::sendReadAttrinfo(Signal* signal, 
                             Uint32 ToutBufIndex,

                             const Operationrec * const regOperPtr)

{

  if(ToutBufIndex == 0)

    return;



  const BlockReference recBlockref = regOperPtr->recBlockref;

  const Uint32 sig0 = regOperPtr->tcOperationPtr;

  const Uint32 sig1 = regOperPtr->transid1;

ndb/test/run-test/ndb-autotest.sh

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ fi 
# Validate that all interesting

#   variables where set in conf

###############################

vars="target base_dir src_clone install_dir build_dir hosts configure"

vars="target base_dir src_clone_base install_dir build_dir hosts configure"

if [ "$report" ]

then

	vars="$vars result_host result_path"