From: Mauritz Sundell
Date: November 22 2012 9:51am
Subject: bzr push into mysql-5.1-telco-7.1 branch (mauritz.sundell:4671 to 4672)
List-Archive: http://lists.mysql.com/commits/145367
Message-Id: <20121122095134.21584.65586.4672@msundell-laptop>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4672 Mauritz Sundell	2012-11-22 [merge]
      merge 7.0 -> 7.1

    modified:
      storage/ndb/include/ndbapi/Ndb.hpp
 4671 magnus.blaudd@stripped	2012-11-22
      clusterj
       - undo the removal of have_junit.inc, it's still used in 7.1

    added:
      mysql-test/suite/ndb/include/have_junit.inc
=== modified file 'storage/ndb/include/ndbapi/Ndb.hpp'
--- a/storage/ndb/include/ndbapi/Ndb.hpp	2012-06-11 14:47:18 +0000
+++ b/storage/ndb/include/ndbapi/Ndb.hpp	2012-11-22 09:48:15 +0000
@@ -2064,6 +2064,11 @@ private:
 #endif
 
 #ifdef VM_TRACE
+/**
+ * my_attribute.h need GCC_VERSION defined from my_global.h,
+ * otherwise it will redefine __attribute__
+ */
+#include <my_global.h>
 #include <my_attribute.h>
   void printState(const char* fmt, ...)
     ATTRIBUTE_FORMAT(printf, 2, 3);

No bundle (reason: useless for push emails).