database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

changed NdbConnection to NdbTransaction

Browse Source
This commit is contained in:
unknown
2005-01-04 08:30:48 +01:00
parent 3410ce0927
commit a0e534c7e5
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndb/tools/delete_all.cpp
View File

@ -119,7 +119,7 @@ int clear_table(Ndb* pNdb, const NdbDictionary::Table* pTab, int parallelism)
const int retryMax = 10; const int retryMax = 10;
int deletedRows = 0; int deletedRows = 0;
int check; int check;
NdbConnection *pTrans; NdbTransaction *pTrans;
NdbScanOperation *pOp; NdbScanOperation *pOp;
NdbError err; NdbError err;

10
ndb/tools/restore/consumer_restore.cpp
View File

@ -21,7 +21,7 @@ extern FilteredNdbOut err;
extern FilteredNdbOut info; extern FilteredNdbOut info;
extern FilteredNdbOut debug; extern FilteredNdbOut debug;
static void callback(int, NdbConnection*, void*); static void callback(int, NdbTransaction*, void*);
extern const char * g_connect_string; extern const char * g_connect_string;
bool bool
@ -492,7 +492,7 @@ BackupRestore::logEntry(const LogEntry & tup)
if (!m_restore) if (!m_restore)
return; return;
NdbConnection * trans = m_ndb->startTransaction(); NdbTransaction * trans = m_ndb->startTransaction();
if (trans == NULL) if (trans == NULL)
{ {
// Deep shit, TODO: handle the error // Deep shit, TODO: handle the error
@ -584,12 +584,12 @@ BackupRestore::endOfLogEntrys()
* *
* (This function must have three arguments: * (This function must have three arguments:
* - The result of the transaction, * - The result of the transaction,
* - The NdbConnection object, and * - The NdbTransaction object, and
* - A pointer to an arbitrary object.) * - A pointer to an arbitrary object.)
*/ */
static void static void
callback(int result, NdbConnection* trans, void* aObject) callback(int result, NdbTransaction* trans, void* aObject)
{ {
restore_callback_t *cb = (restore_callback_t *)aObject; restore_callback_t *cb = (restore_callback_t *)aObject;
(cb->restore)->cback(result, cb); (cb->restore)->cback(result, cb);
@ -603,7 +603,7 @@ BackupRestore::tuple(const TupleS & tup)
return; return;
while (1) while (1)
{ {
NdbConnection * trans = m_ndb->startTransaction(); NdbTransaction * trans = m_ndb->startTransaction();
if (trans == NULL) if (trans == NULL)
{ {
// Deep shit, TODO: handle the error // Deep shit, TODO: handle the error

16
ndb/tools/restore/consumer_restorem.cpp
View File

@ -21,8 +21,8 @@ extern FilteredNdbOut err;
extern FilteredNdbOut info; extern FilteredNdbOut info;
extern FilteredNdbOut debug; extern FilteredNdbOut debug;
static bool asynchErrorHandler(NdbConnection * trans, Ndb * ndb); static bool asynchErrorHandler(NdbTransaction * trans, Ndb * ndb);
static void callback(int result, NdbConnection* trans, void* aObject); static void callback(int result, NdbTransaction* trans, void* aObject);
bool bool
BackupRestore::init() BackupRestore::init()
@ -371,7 +371,7 @@ BackupRestore::tuple(const TupleS & tup)
return; return;
while (1) while (1)
{ {
NdbConnection * trans = m_ndb->startTransaction(); NdbTransaction * trans = m_ndb->startTransaction();
if (trans == NULL) if (trans == NULL)
{ {
// Deep shit, TODO: handle the error // Deep shit, TODO: handle the error
@ -460,7 +460,7 @@ BackupRestore::logEntry(const LogEntry & tup)
if (!m_restore) if (!m_restore)
return; return;
NdbConnection * trans = m_ndb->startTransaction(); NdbTransaction * trans = m_ndb->startTransaction();
if (trans == NULL) if (trans == NULL)
{ {
// Deep shit, TODO: handle the error // Deep shit, TODO: handle the error
@ -551,7 +551,7 @@ BackupRestore::endOfLogEntrys()
* *
******************************************/ ******************************************/
static void restoreCallback(int result, // Result for transaction static void restoreCallback(int result, // Result for transaction
NdbConnection *object, // Transaction object NdbTransaction *object, // Transaction object
void *anything) // Not used void *anything) // Not used
{ {
static Uint32 counter = 0; static Uint32 counter = 0;
@ -593,12 +593,12 @@ static void restoreCallback(int result, // Result for transaction
* *
* (This function must have three arguments: * (This function must have three arguments:
* - The result of the transaction, * - The result of the transaction,
* - The NdbConnection object, and * - The NdbTransaction object, and
* - A pointer to an arbitrary object.) * - A pointer to an arbitrary object.)
*/ */
static void static void
callback(int result, NdbConnection* trans, void* aObject) callback(int result, NdbTransaction* trans, void* aObject)
{ {
restore_callback_t *cb = (restore_callback_t *)aObject; restore_callback_t *cb = (restore_callback_t *)aObject;
(cb->restore)->cback(result, cb); (cb->restore)->cback(result, cb);
@ -610,7 +610,7 @@ callback(int result, NdbConnection* trans, void* aObject)
* false if it is an error that generates an abort. * false if it is an error that generates an abort.
*/ */
static static
bool asynchErrorHandler(NdbConnection * trans, Ndb* ndb) bool asynchErrorHandler(NdbTransaction * trans, Ndb* ndb)
{ {
NdbError error = trans->getNdbError(); NdbError error = trans->getNdbError();
ndb->closeTransaction(trans); ndb->closeTransaction(trans);

2
ndb/tools/select_all.cpp
View File

@ -194,7 +194,7 @@ int scanReadRecords(Ndb* pNdb,
int retryAttempt = 0; int retryAttempt = 0;
const int retryMax = 100; const int retryMax = 100;
int check; int check;
NdbConnection *pTrans; NdbTransaction *pTrans;
NdbScanOperation *pOp; NdbScanOperation *pOp;
NdbIndexScanOperation * pIOp= 0; NdbIndexScanOperation * pIOp= 0;

2
ndb/tools/select_count.cpp
View File

@ -141,7 +141,7 @@ select_count(Ndb* pNdb, const NdbDictionary::Table* pTab,
int retryAttempt = 0; int retryAttempt = 0;
const int retryMax = 100; const int retryMax = 100;
int check; int check;
NdbConnection *pTrans; NdbTransaction *pTrans;
NdbScanOperation *pOp; NdbScanOperation *pOp;
while (true){ while (true){