Commit 77fc294a authored by unknown's avatar unknown
Browse files

Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-misc 

into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-misc


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
parents 309e0d6f 1b3bcced

storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp

+1 −0
Original line number Diff line number Diff line
@@ -719,6 +719,7 @@ Cmvmi::execTEST_ORD(Signal * signal){ 
      // Do nothing

      break;

    }

    globalSignalLoggers.flushSignalLog();

  }



#endif

storage/ndb/test/ndbapi/testDict.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1988,7 +1988,7 @@ runDictOps(NDBT_Context* ctx, NDBT_Step* step) 
    // create indexes

    const char** indlist = NDBT_Tables::getIndexes(tabName);

    uint indnum = 0;

    while (*indlist != 0) {

    while (indlist != 0 && *indlist != 0) {

      uint count = 0;

    try_create_index:

      count++;

storage/ndb/test/run-test/daily-basic-tests.txt

+1 −1
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ args: -n TemporaryTables T1 T6 T7 T8 


max-time: 1500

cmd: testDict

args: -n Restart_NR2 T1

args: -n Restart_NR2 T1 I3



#

# TEST NDBAPI