From: Martin Zaun
Date: February 21 2011 5:41pm
Subject: bzr commit into mysql-5.1-telco-7.1 branch (martin.zaun:4098)
List-Archive: http://lists.mysql.com/commits/131795
Message-Id: <201102211742.p1LFRGaS015208@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6203202753409189274=="

--===============6203202753409189274==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/mz/mysql/ndb-7.1/ based on revid:bocklin@stripped

 4098 Martin Zaun	2011-02-21 [merge]
      merge from ndb-7.0 to ndb-7.1

    modified:
      storage/ndb/include/util/NdbTypesUtil.hpp
      storage/ndb/test/ndbapi/testDict.cpp
      storage/ndb/test/ndbapi/testNdbApi.cpp
      storage/ndb/test/ndbapi/testNodeRestart.cpp
      storage/ndb/test/ndbapi/test_event.cpp
=== modified file 'storage/ndb/include/util/NdbTypesUtil.hpp'
--- a/storage/ndb/include/util/NdbTypesUtil.hpp	2011-02-19 02:47:10 +0000
+++ b/storage/ndb/include/util/NdbTypesUtil.hpp	2011-02-21 17:39:23 +0000
@@ -435,13 +435,11 @@ NDB_SPECIALIZE_NUM_TYPE_HELPER(Huint64, 
 // specialize the Helper template members for non-standard numeric types
 #define NDB_SPECIALIZE_NON_STD_NUM_TYPE_HELPER( H, T, INT3KORR )        \
   template<> inline void H::load(T * t, const char * s) {               \
-    assert(t); assert(s);                                               \
-    assert(t > (const T *)s);                                           \
+    assert(t); assert(s); assert(t != (const T *)s);                    \
     *t = (INT3KORR(s));                                                 \
   }                                                                     \
   template<> inline void H::store(char * t, const T * s) {              \
-    assert(t); assert(s);                                               \
-    assert(((T *)t > s) || ((T *)t < s));                               \
+    assert(t); assert(s); assert((const T *)t != s);                    \
     int3store(t, (*s));                                                 \
   }
 

=== 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/testNodeRestart.cpp'
--- a/storage/ndb/test/ndbapi/testNodeRestart.cpp	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/test/ndbapi/testNodeRestart.cpp	2011-02-21 13:17:16 +0000
@@ -4062,11 +4062,22 @@ runForceStopAndRestart(NDBT_Context* ctx
     }
   }
 
+  printf("group1: ");
+  for (size_t i = 0; i<group1.size(); i++)
+    printf("%d ", group1[i]);
+  printf("\n");
+
+  printf("group2: ");
+  for (size_t i = 0; i<group2.size(); i++)
+    printf("%d ", group2[i]);
+  printf("\n");
+
   // Stop half of the cluster
   res.restartNodes(group1.getBase(), (int)group1.size(),
-                   NdbRestarter::NRRF_NOSTART);
+                   NdbRestarter::NRRF_NOSTART | NdbRestarter::NRRF_ABORT);
   res.waitNodesNoStart(group1.getBase(), (int)group1.size());
 
+  ndbout_c("%u", __LINE__);
   // Try to stop first node in second half without force, should return error
   if (res.restartOneDbNode(group2[0],
                            false, /* initial */
@@ -4074,10 +4085,13 @@ runForceStopAndRestart(NDBT_Context* ctx
                            false, /* abort */
                            false  /* force */) != -1)
   {
+    ndbout_c("%u", __LINE__);
     g_err << "Restart suceeded without force" << endl;
     return NDBT_FAILED;
   }
 
+  ndbout_c("%u", __LINE__);
+
   // Now stop with force
   if (res.restartOneDbNode(group2[0],
                            false, /* initial */
@@ -4085,18 +4099,25 @@ runForceStopAndRestart(NDBT_Context* ctx
                            false, /* abort */
                            true   /* force */) != 0)
   {
+    ndbout_c("%u", __LINE__);
     g_err << "Could not restart with force" << endl;
     return NDBT_FAILED;
   }
 
+  ndbout_c("%u", __LINE__);
+
   // All nodes should now be in nostart, the above stop force
   // cvaused the remainig nodes to be stopped(and restarted nostart)
   res.waitClusterNoStart();
 
+  ndbout_c("%u", __LINE__);
+
   // Start second half back up again
   res.startNodes(group2.getBase(), (int)group2.size());
   res.waitNodesStarted(group2.getBase(), (int)group2.size());
 
+  ndbout_c("%u", __LINE__);
+
   // Try to stop remaining half without force, should return error
   if (res.restartNodes(group2.getBase(), (int)group2.size(),
                        NdbRestarter::NRRF_NOSTART) != -1)
@@ -4105,6 +4126,8 @@ runForceStopAndRestart(NDBT_Context* ctx
     return NDBT_FAILED;
   }
 
+  ndbout_c("%u", __LINE__);
+
   // Now stop with force
   if (res.restartNodes(group2.getBase(), (int)group2.size(),
                        NdbRestarter::NRRF_NOSTART |
@@ -4113,6 +4136,9 @@ runForceStopAndRestart(NDBT_Context* ctx
     g_err << "Could not restart with force" << endl;
     return NDBT_FAILED;
   }
+
+  ndbout_c("%u", __LINE__);
+
   if (res.waitNodesNoStart(group2.getBase(), (int)group2.size()))
   {
     g_err << "Failed to waitNodesNoStart" << endl;

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


--===============6203202753409189274==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/martin.zaun@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@stripped
# target_branch: file:///Users/mz/mysql/ndb-7.1/
# testament_sha1: 07c98677617fc3c3deb54db5e76718faeb326f1a
# timestamp: 2011-02-21 09:41:53 -0800
# source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/
# base_revision_id: bocklin@stripped\
#   6so8sja4z0bvv3xx
# 
# Begin bundle
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
WnxOhOt4JtJEQO8gbf/F3JFOFCQG7ic8AA==


--===============6203202753409189274==--