Commit 574bce49 authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 

into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
parents 4a4425cc 7276679b

storage/ndb/test/ndbapi/testDict.cpp

+7 −3
Original line number Diff line number Diff line
@@ -2776,11 +2776,15 @@ runDropDDObjects(NDBT_Context* ctx, NDBT_Step* step){ 
      case NdbDictionary::Object::UserTable:

        tableFound = list.elements[i].name;

        if(tableFound != 0){

          if(strcmp(tableFound, "ndb_apply_status") != 0 && 

             strcmp(tableFound, "NDB$BLOB_2_3") != 0 &&

             strcmp(tableFound, "ndb_schema") != 0){

      	    if(pDict->dropTable(tableFound) != 0){

            g_err << "Failed to drop table: " << pDict->getNdbError() << endl;

              g_err << "Failed to drop table: " << tableFound << pDict->getNdbError() << endl;

              return NDBT_FAILED;

            }

          }

        }

        tableFound = 0;

        break;

      default: