diff options
| author | joreland@mysql.com <> | 2005-06-01 07:59:48 +0200 |
|---|---|---|
| committer | joreland@mysql.com <> | 2005-06-01 07:59:48 +0200 |
| commit | bdd0f5f823a7f080216f7b4a07763b5e9903e83d (patch) | |
| tree | cc91afc48646f0c898420bf20a864d956c128aac /ndb | |
| parent | b4218497c437b20ab660244aaac4d9aed4d55185 (diff) | |
| parent | 48f5fae9ff1f4568d4fbd68e068cda51e9ea7d70 (diff) | |
| download | mariadb-git-bdd0f5f823a7f080216f7b4a07763b5e9903e83d.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/kernel/blocks/dbdih/DbdihMain.cpp | 1 | ||||
| -rw-r--r-- | ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp | 3 | ||||
| -rwxr-xr-x | ndb/test/run-test/ndb-autotest.sh | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp index b2ed7acd347..03309f3ac67 100644 --- a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp +++ b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp @@ -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 diff --git a/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp b/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp index 6527864135b..6a478bea917 100644 --- a/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp +++ b/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp @@ -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; diff --git a/ndb/test/run-test/ndb-autotest.sh b/ndb/test/run-test/ndb-autotest.sh index 921b5f8a862..3ba4d1928d5 100755 --- a/ndb/test/run-test/ndb-autotest.sh +++ b/ndb/test/run-test/ndb-autotest.sh @@ -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" |