database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge

Browse Source 
ndb/include/ndbapi/Ndb.hpp:
  Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbIndexOperation.hpp:
  Auto merged
ndb/Epilogue.mk_old:
  Auto merged
ndb/src/common/debugger/signaldata/Makefile_old:
  Auto merged
ndb/src/common/mgmcommon/Makefile_old:
  Auto merged
ndb/src/common/util/Makefile_old:
  Auto merged
ndb/src/kernel/Makefile_old:
  Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Makefile_old:
  Auto merged
ndb/src/kernel/vm/Makefile_old:
  Auto merged
ndb/src/mgmapi/Makefile_old:
  Auto merged
ndb/src/mgmclient/Makefile_old:
  Auto merged
ndb/src/mgmsrv/Makefile_old:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
ndb/src/ndbapi/Makefile_old:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbApiSignal.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperation.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationInt.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/test/ndbapi/Makefile_old:
  Auto merged
ndb/test/ndbapi/ScanFunctions.hpp:
  Auto merged
ndb/test/ndbapi/ScanInterpretTest.hpp:
  Auto merged
ndb/test/ndbapi/testDataBuffers.cpp:
  Auto merged
ndb/test/ndbapi/old_dirs/testBackup/Makefile:
  Auto merged
ndb/test/ndbapi/old_dirs/testGrep/Makefile:
  Auto merged
ndb/test/ndbapi/old_dirs/testGrep/verify/Makefile:
  Auto merged
ndb/test/ndbapi/testDict.cpp:
  Auto merged
ndb/test/ndbapi/testGrep.cpp:
  Auto merged
ndb/test/ndbapi/testIndex.cpp:
  Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged
ndb/test/ndbapi/testTimeout.cpp:
  Auto merged
ndb/test/src/Makefile_old:
  Auto merged
ndb/test/src/UtilTransactions.cpp:
  Auto merged
ndb/test/tools/create_index.cpp:
  Auto merged
ndb/tools/select_all.cpp:
  Auto merged
This commit is contained in:
unknown
2004-05-27 11:36:10 +02:00
parent 489aa9be1c 910b86cdac
commit da2ae18998
195 changed files with 11897 additions and 12032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ndb/test/ndbapi/testOIBasic.cpp
View File

@ -551,7 +551,8 @@ struct Con {
NdbConnection* m_tx;
NdbOperation* m_op;
NdbConnection* m_scantx;
NdbOperation* m_scanop;
NdbIndexScanOperation* m_scanop;
NdbResultSet* m_resultSet;
enum ScanMode { ScanNo = 0, Committed, Latest, Exclusive };
ScanMode m_scanmode;
enum ErrType { ErrNone = 0, ErrDeadlock, ErrOther };
@ -632,7 +633,7 @@ Con::getNdbOperation(const Tab& tab)
int
Con::getNdbOperation(const ITab& itab, const Tab& tab)
{
CHKCON((m_op = m_tx->getNdbOperation(itab.m_name, tab.m_name)) != 0, *this);
CHKCON((m_scanop = m_tx->getNdbIndexScanOperation(itab.m_name, tab.m_name)) != 0, *this);
return 0;
}
@ -664,7 +665,7 @@ int
Con::setBound(int num, int type, const void* value)
{
assert(m_tx != 0 && m_op != 0);
CHKCON(m_op->setBound(num, type, value) == 0, *this);
CHKCON(m_scanop->setBound(num, type, value) == 0, *this);
return 0;
}
@ -680,7 +681,7 @@ int
Con::openScanRead(unsigned parallelism)
{
assert(m_tx != 0 && m_op != 0);
CHKCON(m_op->openScanRead(parallelism) == 0, *this);
CHKCON((m_resultSet = m_scanop->readTuples(parallelism)) != 0, *this);
return 0;
}
@ -688,14 +689,14 @@ int
Con::openScanExclusive(unsigned parallelism)
{
assert(m_tx != 0 && m_op != 0);
CHKCON(m_op->openScanExclusive(parallelism) == 0, *this);
CHKCON((m_resultSet = m_scanop->readTuplesExclusive(parallelism)) != 0, *this);
return 0;
}
int
Con::executeScan()
{
CHKCON(m_tx->executeScan() == 0, *this);
CHKCON(m_tx->execute(NoCommit) == 0, *this);
return 0;
}
@ -703,7 +704,8 @@ int
Con::nextScanResult()
{
int ret;
CHKCON((ret = m_tx->nextScanResult()) != -1, *this);
assert(m_resultSet != 0);
CHKCON((ret = m_resultSet->nextResult()) != -1, *this);
assert(ret == 0 || ret == 1);
return ret;
}
@ -712,7 +714,7 @@ int
Con::takeOverForUpdate(Con& scan)
{
assert(m_tx != 0 && scan.m_op != 0);
CHKCON((m_op = scan.m_op->takeOverForUpdate(m_tx)) != 0, scan);
CHKCON((m_op = scan.m_resultSet->updateTuple(m_tx)) != 0, scan);
return 0;
}
@ -720,7 +722,7 @@ int
Con::takeOverForDelete(Con& scan)
{
assert(m_tx != 0 && scan.m_op != 0);
CHKCON((m_op = scan.m_op->takeOverForUpdate(m_tx)) != 0, scan);
CHKCON(scan.m_resultSet->deleteTuple(m_tx) == 0, scan);
return 0;
}