bzr commit into mysql-5.1-telco-6.3 branch (jonas:3262)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.3/ based on revid:magnus.blaudd@stripped

 3262 Jonas Oreland	2010-08-26
      ndb - fix boring bug in testDict -n Bug36702

    modified:
      storage/ndb/test/ndbapi/testDict.cpp
=== modified file 'storage/ndb/test/ndbapi/testDict.cpp'
--- a/storage/ndb/test/ndbapi/testDict.cpp	2010-06-21 09:55:21 +0000
+++ b/storage/ndb/test/ndbapi/testDict.cpp	2010-08-26 08:54:57 +0000
@@ -128,7 +128,8 @@ int runCreateTheTable(NDBT_Context* ctx,
   }
   ctx->setTab(pTab2);
 
-  BaseString::snprintf(f_tablename, sizeof(f_tablename), pTab->getName());
+  BaseString::snprintf(f_tablename, sizeof(f_tablename), 
+                       "%s", pTab->getName());
 
   return NDBT_OK;
 }
@@ -3394,9 +3395,8 @@ runDropDDObjects(NDBT_Context* ctx, NDBT
         tableFound = list.elements[i].name;
         if(tableFound != 0){
           if(strcmp(list.elements[i].database, "TEST_DB") == 0 &&
-             strcmp(tableFound, "ndb_apply_status") != 0 &&
-             strcmp(tableFound, "NDB$BLOB_2_3") != 0 &&
-             strcmp(tableFound, "ndb_schema") != 0){
+             !is_prefix(tableFound, "NDB$BLOB"))
+          { 
       	    if(pDict->dropTable(tableFound) != 0){
               g_err << "Failed to drop table: " << tableFound << pDict->getNdbError() << endl;
               return NDBT_FAILED;


Attachment: [text/bzr-bundle] bzr/[e-mail]