bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:3831)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/tmp/iDo_HpDV1t/7.1/ based on revid:magnus.blaudd@stripped5ie8ifq

 3831 Magnus Blåudd	2010-09-23 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/include/util/NdbTap.hpp
=== modified file 'storage/ndb/include/util/NdbTap.hpp'
--- a/storage/ndb/include/util/NdbTap.hpp	2010-09-23 09:36:19 +0000
+++ b/storage/ndb/include/util/NdbTap.hpp	2010-09-23 11:57:39 +0000
@@ -38,7 +38,17 @@ int main(int argc, const char** argv){  
 int name##_test()
 
 /* tap.c needs my_print_stacktrace */
-#undef DONT_DEFINE_VOID // stacktrace.c turns off VOID redefinition if needed
+#ifdef DONT_DEFINE_VOID
+// stacktrace.c turns off VOID redefinition if needed
+#undef DONT_DEFINE_VOID
+#endif
+
+#ifdef HAVE_gcov
+// __gcov_flush need C linkage
+extern "C" void __gcov_flush(void);
+#endif
+
 #include <../../../mysys/stacktrace.c>
 
+
 #endif

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