mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
This commit is contained in:
joreland@mysql.com 2005-05-26 22:43:00 +02:00
commit b0068adc46
5 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ndb/test/ndbapi/testNdbApi.cpp
View file

@ -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)

2
ndb/test/tools/hugoLoad.cpp
View file

@ -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());

2
ndb/test/tools/hugoPkUpdate.cpp
View file

@ -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());

2
ndb/test/tools/hugoScanRead.cpp
View file

@ -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());

2
ndb/test/tools/hugoScanUpdate.cpp
View file

@ -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());