From: Date: June 18 2008 5:06pm Subject: bzr commit into mysql-5.1-telco-6.2 branch (jonas:2629) Bug#31701 List-Archive: http://lists.mysql.com/commits/48104 X-Bug: 31701 Message-Id: <20080618150601.201EB7D580@perch.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/jonas/src/telco-6.2/ 2629 jonas@stripped 2008-06-18 ndb - fix merge error in test_event -n Bug31701 modified: storage/ndb/test/ndbapi/test_event.cpp === modified file 'storage/ndb/test/ndbapi/test_event.cpp' --- a/storage/ndb/test/ndbapi/test_event.cpp 2008-06-17 08:49:39 +0000 +++ b/storage/ndb/test/ndbapi/test_event.cpp 2008-06-18 15:05:56 +0000 @@ -1806,7 +1806,6 @@ runBug31701(NDBT_Context* ctx, NDBT_Step int records = ctx->getNumRecords(); HugoTransactions hugoTrans(*ctx->getTab()); - if(ctx->getPropertyWait("LastGCI", ~(Uint32)0)) if(ctx->getPropertyWait("LastGCI_hi", ~(Uint32)0)) { g_err << "FAIL " << __LINE__ << endl;