1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
This commit is contained in:
unknown 2005-06-01 07:59:48 +02:00
commit b11d2b6b73
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
View File

@ -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

3
ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp
View File

@ -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;

2
ndb/test/run-test/ndb-autotest.sh
View File

@ -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"