bzr push into mysql-5.1-telco-7.0 branch (jonas:4208 to 4211)

[Jonas Oreland]

 4211 Jonas Oreland	2011-02-21
      ndb - fix testDict -n FailAddPartition which failed (err 4050) with more than 2 nodes...this as error insert was sent to a node, that new partitions didn't end up on...Fix by adding #db-nodes partitions instead of 2

    modified:
      storage/ndb/test/ndbapi/testDict.cpp
 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
 4209 Jonas Oreland	2011-02-21 [merge]
      ndb merge 63 to 70

    modified:
      storage/ndb/test/ndbapi/test_event.cpp
 4208 Jonas Oreland	2011-02-21
      ndb - fix ForceStopAndRestart for >2 nodes

    modified:
      storage/ndb/test/ndbapi/testNodeRestart.cpp
=== modified file 'storage/ndb/test/ndbapi/testDict.cpp'
--- a/storage/ndb/test/ndbapi/testDict.cpp	2011-01-30 20:56:00 +0000
+++ b/storage/ndb/test/ndbapi/testDict.cpp	2011-02-21 15:08:51 +0000
@@ -7186,7 +7186,8 @@ runFailAddPartition(NDBT_Context* ctx, N
 
   const NdbDictionary::Table * org = pDic->getTable(tab.getName());
   NdbDictionary::Table altered = * org;
-  altered.setFragmentCount(org->getFragmentCount() + 2);
+  altered.setFragmentCount(org->getFragmentCount() +
+                           restarter.getNumDbNodes());
 
   if (pDic->beginSchemaTrans())
   {

=== 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;

=== modified file 'storage/ndb/test/ndbapi/test_event.cpp'
--- a/storage/ndb/test/ndbapi/test_event.cpp	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/test/ndbapi/test_event.cpp	2011-02-21 14:10:20 +0000
@@ -3351,14 +3351,15 @@ runBug57886_subscribe_unsunscribe(NDBT_C
 {
   Ndb* pNdb;
   Ndb_cluster_connection *pCC;
+
+  NdbDictionary::Table tab = * ctx->getTab();
+
   if (cc(&pCC, &pNdb))
   {
     // too few api slots...
     return NDBT_OK;
   }
 
-  NdbDictionary::Table tab = * ctx->getTab();
-
   while (!ctx->isTestStopped())
   {
     createEvent(pNdb, tab, false, false);

No bundle (reason: useless for push emails).