Commit aa210ae3 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
parents 6926e703 a0e534c7

ndb/tools/delete_all.cpp

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ int clear_table(Ndb* pNdb, const NdbDictionary::Table* pTab, int parallelism) 
  const int            retryMax = 10;

  int deletedRows = 0;

  int check;

  NdbConnection *pTrans;

  NdbTransaction *pTrans;

  NdbScanOperation *pOp;

  NdbError err;

ndb/tools/restore/consumer_restore.cpp

+5 −5
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ extern FilteredNdbOut err; 
extern FilteredNdbOut info;

extern FilteredNdbOut debug;



static void callback(int, NdbConnection*, void*);

static void callback(int, NdbTransaction*, void*);



extern const char * g_connect_string;

bool
@@ -492,7 +492,7 @@ BackupRestore::logEntry(const LogEntry & tup) 
  if (!m_restore)

    return;



  NdbConnection * trans = m_ndb->startTransaction();

  NdbTransaction * trans = m_ndb->startTransaction();

  if (trans == NULL) 

  {

    // Deep shit, TODO: handle the error
@@ -584,12 +584,12 @@ BackupRestore::endOfLogEntrys() 
 *              

 *   (This function must have three arguments: 

 *   - The result of the transaction, 

 *   - The NdbConnection object, and 

 *   - The NdbTransaction object, and 

 *   - A pointer to an arbitrary object.)

 */



static void

callback(int result, NdbConnection* trans, void* aObject)

callback(int result, NdbTransaction* trans, void* aObject)

{

  restore_callback_t *cb = (restore_callback_t *)aObject;

  (cb->restore)->cback(result, cb);
@@ -603,7 +603,7 @@ BackupRestore::tuple(const TupleS & tup) 
    return;

  while (1) 

  {

    NdbConnection * trans = m_ndb->startTransaction();

    NdbTransaction * trans = m_ndb->startTransaction();

    if (trans == NULL) 

    {

      // Deep shit, TODO: handle the error

ndb/tools/restore/consumer_restorem.cpp

+8 −8
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ extern FilteredNdbOut err; 
extern FilteredNdbOut info;

extern FilteredNdbOut debug;



static bool asynchErrorHandler(NdbConnection * trans, Ndb * ndb);

static void callback(int result, NdbConnection* trans, void* aObject);

static bool asynchErrorHandler(NdbTransaction * trans, Ndb * ndb);

static void callback(int result, NdbTransaction* trans, void* aObject);



bool

BackupRestore::init()
@@ -371,7 +371,7 @@ BackupRestore::tuple(const TupleS & tup) 
    return;

  while (1) 

  {

    NdbConnection * trans = m_ndb->startTransaction();

    NdbTransaction * trans = m_ndb->startTransaction();

    if (trans == NULL) 

    {

      // Deep shit, TODO: handle the error
@@ -460,7 +460,7 @@ BackupRestore::logEntry(const LogEntry & tup) 
  if (!m_restore)

    return;



  NdbConnection * trans = m_ndb->startTransaction();

  NdbTransaction * trans = m_ndb->startTransaction();

  if (trans == NULL) 

  {

    // Deep shit, TODO: handle the error
@@ -551,7 +551,7 @@ BackupRestore::endOfLogEntrys() 
 *

 ******************************************/

static void restoreCallback(int result,            // Result for transaction

			    NdbConnection *object, // Transaction object

			    NdbTransaction *object, // Transaction object

			    void *anything)        // Not used

{

  static Uint32 counter = 0;
@@ -593,12 +593,12 @@ static void restoreCallback(int result, // Result for transaction 
 *              

 *   (This function must have three arguments: 

 *   - The result of the transaction, 

 *   - The NdbConnection object, and 

 *   - The NdbTransaction object, and 

 *   - A pointer to an arbitrary object.)

 */



static void

callback(int result, NdbConnection* trans, void* aObject)

callback(int result, NdbTransaction* trans, void* aObject)

{

  restore_callback_t *cb = (restore_callback_t *)aObject;

  (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.

 */

static

bool asynchErrorHandler(NdbConnection * trans, Ndb* ndb) 

bool asynchErrorHandler(NdbTransaction * trans, Ndb* ndb) 

{

  NdbError error = trans->getNdbError();

  ndb->closeTransaction(trans);

ndb/tools/select_all.cpp

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ int scanReadRecords(Ndb* pNdb, 
  int                  retryAttempt = 0;

  const int            retryMax = 100;

  int                  check;

  NdbConnection	       *pTrans;

  NdbTransaction       *pTrans;

  NdbScanOperation	       *pOp;

  NdbIndexScanOperation * pIOp= 0;

ndb/tools/select_count.cpp

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ select_count(Ndb* pNdb, const NdbDictionary::Table* pTab, 
  int                  retryAttempt = 0;

  const int            retryMax = 100;

  int                  check;

  NdbConnection	       *pTrans;

  NdbTransaction       *pTrans;

  NdbScanOperation	       *pOp;



  while (true){