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

1) Removed to hard require

Browse Source 
2) Fix variable scope for irix compiler
This commit is contained in:
joreland@mysql.com 2004-08-15 21:15:40 +02:00
parent f8778b2c56
commit 5821d2ea9e
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
View File

@ -5912,10 +5912,18 @@ void Dblqh::execACCKEYREF(Signal* signal)
* Only primary replica can get ZTUPLE_ALREADY_EXIST || ZNO_TUPLE_FOUND * Only primary replica can get ZTUPLE_ALREADY_EXIST || ZNO_TUPLE_FOUND
* *
* Unless it's a simple or dirty read * Unless it's a simple or dirty read
*
* NOT TRUE!
* 1) op1 - primary insert ok
* 2) op1 - backup insert fail (log full or what ever)
* 3) op1 - delete ok @ primary
* 4) op1 - delete fail @ backup
*
* -> ZNO_TUPLE_FOUND is possible
*/ */
ndbrequire ndbrequire
(tcPtr->seqNoReplica == 0 || (tcPtr->seqNoReplica == 0 ||
(errCode != ZTUPLE_ALREADY_EXIST && errCode != ZNO_TUPLE_FOUND) || errCode != ZTUPLE_ALREADY_EXIST ||
(tcPtr->operation == ZREAD && (tcPtr->dirtyOp || tcPtr->opSimple))); (tcPtr->operation == ZREAD && (tcPtr->dirtyOp || tcPtr->opSimple)));
} }
tcPtr->abortState = TcConnectionrec::ABORT_FROM_LQH; tcPtr->abortState = TcConnectionrec::ABORT_FROM_LQH;

2
ndb/test/src/NDBT_Tables.cpp
View File

@ -849,7 +849,7 @@ NDBT_Tables::createTable(Ndb* pNdb, const char* _name, bool _temp,
} }
Uint32 i = 0; Uint32 i = 0;
for(Uint32 i = 0; indexes[i].m_table != 0; i++){ for(i = 0; indexes[i].m_table != 0; i++){
if(strcmp(indexes[i].m_table, _name) != 0) if(strcmp(indexes[i].m_table, _name) != 0)
continue; continue;
Uint32 j = 0; Uint32 j = 0;