From: Date: August 12 2008 8:04pm
Subject: bzr commit into mysql-6.0-falcon branch (vvaintroub:2774) Bug#38746
List-Archive: http://lists.mysql.com/commits/51441
X-Bug: 38746
Message-Id: <200808121804.m7CI4RcY008153@u64>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///media/disk/bzr/mysql-6.0-falcon-team/

 2774 Vladislav Vaintroub	2008-08-12
      Bug#38746 - falcon does not build on Linux with Valgrind enabled
      Add autoconf check for valgrind/memcheck.h
modified:
  storage/falcon/MemMgr.cpp
  storage/falcon/plug.in

=== modified file 'storage/falcon/MemMgr.cpp'
--- a/storage/falcon/MemMgr.cpp	2008-08-11 19:56:57 +0000
+++ b/storage/falcon/MemMgr.cpp	2008-08-12 18:04:19 +0000
@@ -37,8 +37,13 @@
 #include "MemControl.h"
 
 #ifdef HAVE_purify
+#ifdef HAVE_CONFIG
+#include <config.h> 
+#endif
+#ifdef HAVE_VALGRIND_MEMCHECK_H
 #include <valgrind/memcheck.h>
 #endif
+#endif
 
 #ifndef VALGRIND_MAKE_MEM_UNDEFINED
 #define VALGRIND_MAKE_MEM_DEFINED(address, length)

=== modified file 'storage/falcon/plug.in'
--- a/storage/falcon/plug.in	2008-07-25 12:31:16 +0000
+++ b/storage/falcon/plug.in	2008-08-12 18:04:19 +0000
@@ -43,6 +43,8 @@ if test "$falcon_supported_by_machine" !
   with_plugin_falcon="no"
 fi
 
+AC_CHECK_HEADER(valgrind/memcheck.h)
+
 # Generate Makefile for TransformLib.
 MYSQL_PLUGIN_ACTIONS(falcon,[
   AC_CONFIG_FILES(storage/falcon/TransformLib/Makefile)