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

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca

Browse Source 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
This commit is contained in:
jonas@perch.ndb.mysql.com
2007-03-19 14:55:13 +01:00
parent 6856693904 886e11736b
commit 229ee6d4f1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
storage/ndb/test/ndbapi/test_event.cpp
View File

@@ -842,11 +842,12 @@ int runEventListenerUntilStopped(NDBT_Context* ctx, NDBT_Step* step)
int result = NDBT_OK; int result = NDBT_OK;
const NdbDictionary::Table * table= ctx->getTab(); const NdbDictionary::Table * table= ctx->getTab();
HugoTransactions hugoTrans(* table); HugoTransactions hugoTrans(* table);
Ndb* ndb= GETNDB(step);
char buf[1024]; char buf[1024];
sprintf(buf, "%s_EVENT", table->getName()); sprintf(buf, "%s_EVENT", table->getName());
NdbEventOperation *pOp, *pCreate = 0; NdbEventOperation *pOp, *pCreate = 0;
pCreate = pOp = GETNDB(step)->createEventOperation(buf); pCreate = pOp = ndb->createEventOperation(buf);
if ( pOp == NULL ) { if ( pOp == NULL ) {
g_err << "Event operation creation failed on %s" << buf << endl; g_err << "Event operation creation failed on %s" << buf << endl;
return NDBT_FAILED; return NDBT_FAILED;
@@ -870,7 +871,6 @@ int runEventListenerUntilStopped(NDBT_Context* ctx, NDBT_Step* step)
goto end; goto end;
} }
Ndb* ndb= GETNDB(step);
while(!ctx->isTestStopped()) while(!ctx->isTestStopped())
{ {
Uint64 curr_gci = 0; Uint64 curr_gci = 0;
@@ -887,10 +887,10 @@ int runEventListenerUntilStopped(NDBT_Context* ctx, NDBT_Step* step)
end: end:
if(pCreate) if(pCreate)
{ {
if (GETNDB(step)->dropEventOperation(pCreate)) { if (ndb->dropEventOperation(pCreate)) {
g_err << "dropEventOperation execution failed " g_err << "dropEventOperation execution failed "
<< GETNDB(step)->getNdbError().code << " " << ndb->getNdbError().code << " "
<< GETNDB(step)->getNdbError().message << endl; << ndb->getNdbError().message << endl;
result = NDBT_FAILED; result = NDBT_FAILED;
} }
} }