Commit f8161277 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jonas/src/mysql-5.0-ndb
parents 0939d7cf a81aa47d

ndb/test/ndbapi/testNdbApi.cpp

+2 −3
Original line number Diff line number Diff line
@@ -942,8 +942,7 @@ int runReadWithoutGetValue(NDBT_Context* ctx, NDBT_Step* step){ 
      return NDBT_FAILED;

    }

    

    NdbResultSet *rs;

    if ((rs = pOp->readTuples((NdbOperation::LockMode)lm)) == 0){

    if ((pOp->readTuples((NdbOperation::LockMode)lm)) != 0){

      pNdb->closeTransaction(pCon);

      ERR(pOp->getNdbError());

      return NDBT_FAILED;
@@ -962,7 +961,7 @@ int runReadWithoutGetValue(NDBT_Context* ctx, NDBT_Step* step){ 
    }

  

    int res;

    while((res = rs->nextResult()) == 0);

    while((res = pOp->nextResult()) == 0);

    pNdb->closeTransaction(pCon);  

    

    if(res != 1)

ndb/test/tools/hugoLoad.cpp

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ int main(int argc, const char** argv){ 
  {

    return NDBT_ProgramExit(NDBT_FAILED);

  }

  Ndb MyNdb( db ? db : "TEST_DB" );

  Ndb MyNdb( &con, db ? db : "TEST_DB" );



  if(MyNdb.init() != 0){

    ERR(MyNdb.getNdbError());

ndb/test/tools/hugoPkUpdate.cpp

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ int main(int argc, const char** argv){ 
  {

    return NDBT_ProgramExit(NDBT_FAILED);

  }

  Ndb MyNdb( db ? db : "TEST_DB" );

  Ndb MyNdb( &con, db ? db : "TEST_DB" );



  if(MyNdb.init() != 0){

    ERR(MyNdb.getNdbError());

ndb/test/tools/hugoScanRead.cpp

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ int main(int argc, const char** argv){ 
  {

    return NDBT_ProgramExit(NDBT_FAILED);

  }

  Ndb MyNdb( db ? db : "TEST_DB" );

  Ndb MyNdb( &con, db ? db : "TEST_DB" );



  if(MyNdb.init() != 0){

    ERR(MyNdb.getNdbError());

ndb/test/tools/hugoScanUpdate.cpp

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ int main(int argc, const char** argv){ 
  {

    return NDBT_ProgramExit(NDBT_FAILED);

  }

  Ndb MyNdb( db ? db : "TEST_DB" );

  Ndb MyNdb( &con, db ? db : "TEST_DB" );



  if(MyNdb.init() != 0){

    ERR(MyNdb.getNdbError());