Commit 7856482c authored by unknown's avatar unknown

ndb - test_event

  Fix compile error with gcc4


storage/ndb/test/ndbapi/test_event.cpp:
  Fix compile error with gcc4
parent 75bd09a6
...@@ -842,11 +842,12 @@ int runEventListenerUntilStopped(NDBT_Context* ctx, NDBT_Step* step) ...@@ -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) ...@@ -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) ...@@ -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;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment