bzr commit into mysql-5.1-telco-7.0 branch (jonas:4210)

[Jonas Oreland]

#At file:///home/jonas/src/telco-7.0/ based on revid:jonas@stripped

 4210 Jonas Oreland	2011-02-21
      ndb - fix testNdbApi -n FragmentedApiFailure T1, empirical studies show that scan can also get 4002, in the disconnect...which seems reasonable

    modified:
      storage/ndb/test/ndbapi/testNdbApi.cpp
=== modified file 'storage/ndb/test/ndbapi/testNdbApi.cpp'
--- a/storage/ndb/test/ndbapi/testNdbApi.cpp	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/test/ndbapi/testNdbApi.cpp	2011-02-21 14:27:16 +0000
@@ -3605,14 +3605,16 @@ int runFragmentedScanOtherApi(NDBT_Conte
        * on timing
        */
       if ((execError != 0) &&
-          (execError != 874))
+          (execError != 874) && 
+          (execError != 4002))
       {
+        ndbout_c("%u incorrect error code: %u", __LINE__, execError);
         ERR(trans->getNdbError());
         trans->close();
         delete[] buff;
         return NDBT_FAILED;
       }
-      
+
       /* nextResult will always fail */  
       CHECK(-1 == scan->nextResult());
       
@@ -3632,6 +3634,7 @@ int runFragmentedScanOtherApi(NDBT_Conte
         }
         else
         {
+          ndbout_c("%u incorrect error code: %u", __LINE__, execError);
           ERR(scan->getNdbError());
           trans->close();
           delete[] buff;


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