List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:September 23 2010 12:09pm
Subject:bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:3790 to 3791)
View as plain text  
 3791 Magnus Blåudd	2010-09-23
      ndb
       - declare __gcov_flush to have C linkage to avoid link problem when compiling
        stacktrace.c with C++ compiler.

    modified:
      storage/ndb/include/util/NdbTap.hpp
 3790 Magnus Blåudd	2010-09-23 [merge]
      ndb
       - merge in more seagull patches for storage/ndb

    removed:
      storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp
      storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp
      storage/ndb/test/tools/transproxy.cpp
    modified:
      include/config-win.h
      storage/ndb/include/portlib/NdbMem.h
      storage/ndb/include/util/NdbAutoPtr.hpp
      storage/ndb/include/util/azlib.h
      storage/ndb/src/common/util/azio.c
      storage/ndb/src/kernel/blocks/CMakeLists.txt
      storage/ndb/src/kernel/blocks/Makefile.am
      storage/ndb/src/kernel/blocks/ndbfs/AsyncIoThread.cpp
      storage/ndb/src/kernel/blocks/ndbfs/AsyncIoThread.hpp
      storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp
      storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp
      storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
      storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp
      storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.cpp
      storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.hpp
      storage/ndb/src/mgmclient/CommandInterpreter.cpp
      storage/ndb/test/ndbapi/testIndexStat.cpp
      storage/ndb/test/tools/CMakeLists.txt
      storage/ndb/test/tools/Makefile.am
      storage/ndb/tools/restore/consumer_restore.cpp
=== 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/magnus.blaudd@sun.com-20100923115739-03nnmrzwisiwk6vb.bundle
Thread
bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:3790 to 3791) Magnus Blåudd23 Sep