bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:5048 to 5049)

[magnus.blaudd]

 5049 magnus.blaudd@stripped	2012-11-27 [merge]
      Merge

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
 5048 Martin Skold	2012-11-23 [merge]
      Merge from 6.3

    modified:
      sql/ha_ndbcluster_binlog.cc
=== modified file 'storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2012-11-13 10:13:17 +0000
+++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2012-11-23 15:12:04 +0000
@@ -3303,7 +3303,7 @@ Dbspj::checkTableError(Ptr<TreeNode> tre
               << ", error: " << err);
   }
   if (ERROR_INSERTED(17520) ||
-      ERROR_INSERTED(17521) && (rand() % 7) == 0)
+      (ERROR_INSERTED(17521) && (rand() % 7) == 0))
   {
     jam();
     CLEAR_ERROR_INSERT_VALUE;

=== modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2011-12-01 13:39:23 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2012-11-27 09:59:20 +0000
@@ -45,6 +45,7 @@ extern EventLogger * g_eventLogger;
 void Dbtup::initData() 
 {
   TablerecPtr tablePtr;
+  (void)tablePtr; // hide unused warning
   cnoOfFragrec = NDB_ARRAY_SIZE(tablePtr.p->fragrec);
   cnoOfFragoprec = NDB_ARRAY_SIZE(tablePtr.p->fragrec);
   cnoOfAlterTabOps = NDB_ARRAY_SIZE(tablePtr.p->fragrec);

=== modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp	2011-11-14 09:18:48 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp	2012-11-27 09:59:20 +0000
@@ -810,6 +810,7 @@ Dbtup::execALTER_TAB_CONF(Signal* signal
   {
     jam();
     TablerecPtr tablePtr;
+    (void)tablePtr; // hide unused warning
     ndbrequire(buildPtr.p->m_fragNo >= NDB_ARRAY_SIZE(tablePtr.p->fragid));
     buildIndexReply(signal, buildPtr.p);
     c_buildIndexList.release(buildPtr);
@@ -1013,6 +1014,7 @@ Dbtup::execBUILD_INDX_IMPL_REF(Signal* s
   buildPtr.p->m_outstanding--;
 
   TablerecPtr tablePtr;
+  (void)tablePtr; // hide unused warning
   buildPtr.p->m_errorCode = (BuildIndxImplRef::ErrorCode)err;
   // No point in starting any more
   buildPtr.p->m_fragNo = NDB_ARRAY_SIZE(tablePtr.p->fragrec);

No bundle (reason: useless for push emails).