Commit cca0ce5b authored by unknown's avatar unknown
Browse files

ndb - fix conflicting error codes

parent e610dc13

storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ public: 
 

  enum ErrorCode {

    OK = 0

    ,InvalidNodeGroup = 747

    ,InvalidFragmentationType = 748

    ,InvalidNodeGroup = 771

    ,InvalidFragmentationType = 772

    ,InvalidPrimaryTable = 749

  };

storage/ndb/src/ndbapi/ndberror.c

+2 −2
Original line number Diff line number Diff line
@@ -349,8 +349,8 @@ ErrorBundle ErrorCodes[] = { 
  { 743,  HA_WRONG_CREATE_OPTION, SE, "Unsupported character set in table or index" },

  { 744,  DMEC, SE, "Character string is invalid for given character set" },

  { 745,  HA_WRONG_CREATE_OPTION, SE, "Distribution key not supported for char attribute (use binary attribute)" },

  { 747,  HA_WRONG_CREATE_OPTION, AE, "Given NODEGROUP doesn't exist in this cluster" },

  { 748,  HA_WRONG_CREATE_OPTION, IE, "Given fragmentType doesn't exist" },

  { 771,  HA_WRONG_CREATE_OPTION, AE, "Given NODEGROUP doesn't exist in this cluster" },

  { 772,  HA_WRONG_CREATE_OPTION, IE, "Given fragmentType doesn't exist" },

  { 749,  HA_WRONG_CREATE_OPTION, IE, "Primary Table in wrong state" },

  { 761,  DMEC, SE, "Unable to drop table as backup is in progress" },

  { 762,  DMEC, SE, "Unable to alter table as backup is in progress" },

storage/ndb/test/ndbapi/test_event.cpp

+5 −4
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@ int runEventMixedLoad(NDBT_Context* ctx, NDBT_Step* step) 
      g_err << "FAIL " << __LINE__ << endl;

      return NDBT_FAILED;

    }



    if (hugoTrans.pkDelRecords(GETNDB(step), 3*records, 1, true, 1) != 0){

      g_err << "FAIL " << __LINE__ << endl;

      return NDBT_FAILED;
@@ -486,10 +487,11 @@ int runEventMixedLoad(NDBT_Context* ctx, NDBT_Step* step) 
    ctx->setProperty("LastGCI", hugoTrans.m_latest_gci);

    if(ctx->getPropertyWait("LastGCI", ~(Uint32)0))

    {

      g_err << "FAIL " << __LINE__ << endl;

      return NDBT_FAILED;

    }

  }

  

  ctx->stopTest();  

  return NDBT_OK;

}
@@ -519,7 +521,6 @@ int runEventApplier(NDBT_Context* ctx, NDBT_Step* step) 
  DBUG_ENTER("runEventApplier");



  int result = NDBT_OK;

  int loops = ctx->getNumLoops();

  const NdbDictionary::Table * table= ctx->getTab();

  HugoTransactions hugoTrans(* table);
@@ -557,7 +558,7 @@ int runEventApplier(NDBT_Context* ctx, NDBT_Step* step) 
    goto end;

  }



  while(loops-- && !ctx->isTestStopped())

  while(!ctx->isTestStopped())

  {

    int r;

    int count= 0;