bzr commit into mysql-6.0 branch (df:2676)

[Daniel Fischer]

#At file:///shared/home/df/mysql/bazaar/mysql-6.0-build-danny/

 2676 Daniel Fischer	2008-07-08
      should likely get rid of the condition's left branch, but I'm not in an invasive mood today
modified:
  sql/probes.h

=== modified file 'sql/probes.h'
--- a/sql/probes.h	2007-09-21 07:09:31 +0000
+++ b/sql/probes.h	2008-07-08 13:49:57 +0000
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#if _DTRACE_VERSION
+#if _DTRACE_VERSION && defined(HAVE_DTRACE)
 
 #define	MYSQL_DELETE_END() \
 	__dtrace_mysql___delete_end()