diff -Nru config/ac-macros/dtrace.m4 config/ac-macros/dtrace.m4

--- config/ac-macros/dtrace.m4	1970-01-01 01:00:00.000000000 +0100

+++ config/ac-macros/dtrace.m4	2011-05-27 10:50:57.000000000 +0200

@@ -0,0 +1,43 @@

+dnl ---------------------------------------------------------------------------

+dnl Macro: DTRACE_TEST

+dnl ---------------------------------------------------------------------------

+AC_ARG_ENABLE(dtrace,

+    AC_HELP_STRING([--enable-dtrace],[Build with support for DTrace.]),

+    [

+      ENABLE_DTRACE="$enable_dtrace"

+    ],

+    [

+      ENABLE_DTRACE="yes" 

+    ]

+)

+DTRACEFLAGS=""

+HAVE_DTRACE=""

+HAVE_DTRACE_DASH_G=""

+if test "$ENABLE_DTRACE" = "yes"; then

+  AC_PATH_PROG(DTRACE, dtrace, [not found], [$PATH:/usr/sbin])

+  if test "$DTRACE" = "not found"; then

+    ENABLE_DTRACE="no"

+  else

+    AC_DEFINE([HAVE_DTRACE], [1], [Defined to 1 if DTrace support is enabled])

+    case "$target_os" in

+      *solaris*)

+        HAVE_DTRACE_DASH_G="yes"

+        case "$CFLAGS" in

+          *-m64*)

+            DTRACEFLAGS="$DTRACEFLAGS -64"

+            ;;

+        esac

+        ;;

+      *)

+        HAVE_DTRACE_DASH_G="no"

+        ;;

+    esac

+  fi

+fi

+AC_SUBST(DTRACEFLAGS)

+AC_SUBST(HAVE_DTRACE)

+AM_CONDITIONAL([HAVE_DTRACE], [ test "$ENABLE_DTRACE" = "yes" ])

+AM_CONDITIONAL([HAVE_DTRACE_DASH_G], [ test "$HAVE_DTRACE_DASH_G" = "yes" ])

+dnl ---------------------------------------------------------------------------

+dnl End Macro: DTRACE_TEST

+dnl ---------------------------------------------------------------------------

diff -Nru config.h.in config.h.in

--- config.h.in	2011-05-27 11:03:51.000000000 +0200

+++ config.h.in	2011-05-27 10:51:57.000000000 +0200

@@ -268,6 +268,9 @@

 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */

 #undef HAVE_DOPRNT

+/* Defined to 1 if DTrace support is enabled */

+#undef HAVE_DTRACE

+

 /* Access checks in embedded library */

 #undef HAVE_EMBEDDED_PRIVILEGE_CONTROL

diff -Nru configure configure

--- configure	2011-05-27 11:04:09.000000000 +0200

+++ configure	2011-05-27 10:52:16.000000000 +0200

@@ -1047,6 +1047,13 @@

 MAKEINDEX

 PDFLATEX

 DOXYGEN

+HAVE_DTRACE_DASH_G_FALSE

+HAVE_DTRACE_DASH_G_TRUE

+HAVE_DTRACE_FALSE

+HAVE_DTRACE_TRUE

+HAVE_DTRACE

+DTRACEFLAGS

+DTRACE

 am__untar

 am__tar

 AMTAR

@@ -1127,6 +1134,7 @@

 with_extra_charsets

 with_uca

 with_experimental_collations

+enable_dtrace

 with_system_type

 with_machine_type

 with_darwin_mwcc

@@ -1832,6 +1840,7 @@

   --disable-option-checking  ignore unrecognized --enable/--with options

   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)

   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]

+  --enable-dtrace         Build with support for DTrace.

   --disable-dependency-tracking  speeds up one-time build

   --enable-dependency-tracking   do not reject slow dependency extractors

   --enable-shared[=PKGS]  build shared libraries [default=yes]

@@ -3870,6 +3879,106 @@

+# Check whether --enable-dtrace was given.

+if test "${enable_dtrace+set}" = set; then

+  enableval=$enable_dtrace;

+      ENABLE_DTRACE="$enable_dtrace"

+

+else

+

+      ENABLE_DTRACE="yes"

+

+

+fi

+

+DTRACEFLAGS=""

+HAVE_DTRACE=""

+HAVE_DTRACE_DASH_G=""

+if test "$ENABLE_DTRACE" = "yes"; then

+  # Extract the first word of "dtrace", so it can be a program name with args.

+set dummy dtrace; ac_word=$2

+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

+$as_echo_n "checking for $ac_word... " >&6; }

+if test "${ac_cv_path_DTRACE+set}" = set; then

+  $as_echo_n "(cached) " >&6

+else

+  case $DTRACE in

+  [\\/]* | ?:[\\/]*)

+  ac_cv_path_DTRACE="$DTRACE" # Let the user override the test with a path.

+  ;;

+  *)

+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

+as_dummy="$PATH:/usr/sbin"

+for as_dir in $as_dummy

+do

+  IFS=$as_save_IFS

+  test -z "$as_dir" && as_dir=.

+  for ac_exec_ext in '' $ac_executable_extensions; do

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+    ac_cv_path_DTRACE="$as_dir/$ac_word$ac_exec_ext"

+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

+    break 2

+  fi

+done

+done

+IFS=$as_save_IFS

+

+  test -z "$ac_cv_path_DTRACE" && ac_cv_path_DTRACE="not found"

+  ;;

+esac

+fi

+DTRACE=$ac_cv_path_DTRACE

+if test -n "$DTRACE"; then

+  { $as_echo "$as_me:$LINENO: result: $DTRACE" >&5

+$as_echo "$DTRACE" >&6; }

+else

+  { $as_echo "$as_me:$LINENO: result: no" >&5

+$as_echo "no" >&6; }

+fi

+

+

+  if test "$DTRACE" = "not found"; then

+    ENABLE_DTRACE="no"

+  else

+

+cat >>confdefs.h <<\_ACEOF

+#define HAVE_DTRACE 1

+_ACEOF

+

+    case "$target_os" in

+      *solaris*)

+        HAVE_DTRACE_DASH_G="yes"

+        case "$CFLAGS" in

+          *-m64*)

+            DTRACEFLAGS="$DTRACEFLAGS -64"

+            ;;

+        esac

+        ;;

+      *)

+        HAVE_DTRACE_DASH_G="no"

+        ;;

+    esac

+  fi

+fi

+

+

+ if  test "$ENABLE_DTRACE" = "yes" ; then

+  HAVE_DTRACE_TRUE=

+  HAVE_DTRACE_FALSE='#'

+else

+  HAVE_DTRACE_TRUE='#'

+  HAVE_DTRACE_FALSE=

+fi

+

+ if  test "$HAVE_DTRACE_DASH_G" = "yes" ; then

+  HAVE_DTRACE_DASH_G_TRUE=

+  HAVE_DTRACE_DASH_G_FALSE='#'

+else

+  HAVE_DTRACE_DASH_G_TRUE='#'

+  HAVE_DTRACE_DASH_G_FALSE=

+fi

+

+

@@ -45566,6 +45675,20 @@

 LTLIBOBJS=$ac_ltlibobjs

+if test -z "${HAVE_DTRACE_TRUE}" && test -z "${HAVE_DTRACE_FALSE}"; then

+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DTRACE\" was never defined.

+Usually this means the macro was only invoked conditionally." >&5

+$as_echo "$as_me: error: conditional \"HAVE_DTRACE\" was never defined.

+Usually this means the macro was only invoked conditionally." >&2;}

+   { (exit 1); exit 1; }; }

+fi

+if test -z "${HAVE_DTRACE_DASH_G_TRUE}" && test -z "${HAVE_DTRACE_DASH_G_FALSE}"; then

+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DTRACE_DASH_G\" was never defined.

+Usually this means the macro was only invoked conditionally." >&5

+$as_echo "$as_me: error: conditional \"HAVE_DTRACE_DASH_G\" was never defined.

+Usually this means the macro was only invoked conditionally." >&2;}

+   { (exit 1); exit 1; }; }

+fi

 if test -z "${DARWIN_MWCC_TRUE}" && test -z "${DARWIN_MWCC_FALSE}"; then

   { { $as_echo "$as_me:$LINENO: error: conditional \"DARWIN_MWCC\" was never defined.

 Usually this means the macro was only invoked conditionally." >&5

diff -Nru configure.in configure.in

--- configure.in	2011-05-27 11:02:46.000000000 +0200

+++ configure.in	2011-05-27 10:50:57.000000000 +0200

@@ -50,6 +50,7 @@

 sinclude(config/ac-macros/check_cpu.m4)

 sinclude(config/ac-macros/character_sets.m4)

 sinclude(config/ac-macros/compiler_flag.m4)

+sinclude(config/ac-macros/dtrace.m4)

 sinclude(config/ac-macros/plugins.m4)

 sinclude(config/ac-macros/ha_ndbcluster.m4)

 sinclude(config/ac-macros/large_file.m4)

diff -Nru include/Makefile.am include/Makefile.am

--- include/Makefile.am	2011-05-27 11:02:47.000000000 +0200

+++ include/Makefile.am	2011-05-27 10:50:57.000000000 +0200

@@ -67,5 +67,18 @@

 dist-hook:

 	$(RM) -f $(distdir)/mysql_version.h $(distdir)/my_config.h

+

+if HAVE_DTRACE

+BUILT_SOURCES += probes_mysql_dtrace.h

+CLEANFILES += probes_mysql_dtrace.h

+DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d

+

+probes_mysql_dtrace.h: $(DTRACEPROVIDER)

+	$(DTRACE) $(DTRACEFLAGS) -h -s $^ -o $@

+endif

+

+probes_mysql_nodtrace.h: $(DTRACEPROVIDER)

+	$(top_srcdir)/scripts/dheadgen.pl -f $^ > $@

+

 # Don't update the files from bitkeeper

 %::SCCS/s.%

diff -Nru include/Makefile.in include/Makefile.in

--- include/Makefile.in	2011-05-27 11:03:55.000000000 +0200

+++ include/Makefile.in	2011-05-27 10:52:01.000000000 +0200

@@ -50,6 +50,8 @@

 build_triplet = @build@

 host_triplet = @host@

 target_triplet = @target@

+@HAVE_DTRACE_TRUE@am__append_1 = probes_mysql_dtrace.h

+@HAVE_DTRACE_TRUE@am__append_2 = probes_mysql_dtrace.h

 subdir = include

 DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \

 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \

@@ -59,6 +61,7 @@

 	$(top_srcdir)/config/ac-macros/check_cpu.m4 \

 	$(top_srcdir)/config/ac-macros/character_sets.m4 \

 	$(top_srcdir)/config/ac-macros/compiler_flag.m4 \

+	$(top_srcdir)/config/ac-macros/dtrace.m4 \

 	$(top_srcdir)/config/ac-macros/plugins.m4 \

 	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \

 	$(top_srcdir)/config/ac-macros/large_file.m4 \

@@ -130,6 +133,8 @@

 DOT_FRM_VERSION = @DOT_FRM_VERSION@

 DOXYGEN = @DOXYGEN@

 DSYMUTIL = @DSYMUTIL@

+DTRACE = @DTRACE@

+DTRACEFLAGS = @DTRACEFLAGS@

 DUMPBIN = @DUMPBIN@

 DVIS = @DVIS@

 ECHO_C = @ECHO_C@

@@ -142,6 +147,7 @@

 GETCONF = @GETCONF@

 GREP = @GREP@

 GXX = @GXX@

+HAVE_DTRACE = @HAVE_DTRACE@

 HOSTNAME = @HOSTNAME@

 INNODB_DYNAMIC_CFLAGS = @INNODB_DYNAMIC_CFLAGS@

 INSTALL = @INSTALL@

@@ -386,7 +392,7 @@

 yassl_libs = @yassl_libs@

 yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@

 zlib_dir = @zlib_dir@

-BUILT_SOURCES = $(HEADERS_GEN_MAKE) link_sources

+BUILT_SOURCES = $(HEADERS_GEN_MAKE) link_sources $(am__append_1)

 HEADERS_GEN_CONFIGURE = mysql_version.h

 HEADERS_GEN_MAKE = my_config.h

 HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \

@@ -416,10 +422,11 @@

 EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp

 # Remove built files and the symlinked directories

-CLEANFILES = $(BUILT_SOURCES) readline openssl

+CLEANFILES = $(BUILT_SOURCES) readline openssl $(am__append_2)

 # Some include files that may be moved and patched by configure

 DISTCLEANFILES = sched.h $(CLEANFILES) $(HEADERS_GEN_CONFIGURE)

+@HAVE_DTRACE_TRUE@DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d

 all: $(BUILT_SOURCES) config.h

 	$(MAKE) $(AM_MAKEFLAGS) all-am

@@ -696,6 +703,12 @@

 dist-hook:

 	$(RM) -f $(distdir)/mysql_version.h $(distdir)/my_config.h

+@HAVE_DTRACE_TRUE@probes_mysql_dtrace.h: $(DTRACEPROVIDER)

+@HAVE_DTRACE_TRUE@	$(DTRACE) $(DTRACEFLAGS) -h -s $^ -o $@

+

+probes_mysql_nodtrace.h: $(DTRACEPROVIDER)

+	$(top_srcdir)/scripts/dheadgen.pl -f $^ > $@

+

 # Don't update the files from bitkeeper

 %::SCCS/s.%

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

diff -Nru libmysql/Makefile.in libmysql/Makefile.in

--- libmysql/Makefile.in	2011-05-27 11:03:55.000000000 +0200

+++ libmysql/Makefile.in	2011-05-27 10:52:01.000000000 +0200

@@ -89,6 +89,7 @@

 	$(top_srcdir)/config/ac-macros/check_cpu.m4 \

 	$(top_srcdir)/config/ac-macros/character_sets.m4 \

 	$(top_srcdir)/config/ac-macros/compiler_flag.m4 \

+	$(top_srcdir)/config/ac-macros/dtrace.m4 \

 	$(top_srcdir)/config/ac-macros/plugins.m4 \

 	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \

 	$(top_srcdir)/config/ac-macros/large_file.m4 \

@@ -187,13 +188,16 @@

 			-DDEFAULT_HOME_ENV=MYSQL_HOME \

 			-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \

 			-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \

-			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)

+			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" -DDISABLE_DTRACE \

+			$(target_defs)

 DEPDIR = @DEPDIR@

 DIFF = @DIFF@

 DOT_FRM_VERSION = @DOT_FRM_VERSION@

 DOXYGEN = @DOXYGEN@

 DSYMUTIL = @DSYMUTIL@

+DTRACE = @DTRACE@

+DTRACEFLAGS = @DTRACEFLAGS@

 DUMPBIN = @DUMPBIN@

 DVIS = @DVIS@

 ECHO_C = @ECHO_C@

@@ -206,6 +210,7 @@

 GETCONF = @GETCONF@

 GREP = @GREP@

 GXX = @GXX@

+HAVE_DTRACE = @HAVE_DTRACE@

 HOSTNAME = @HOSTNAME@

 INNODB_DYNAMIC_CFLAGS = @INNODB_DYNAMIC_CFLAGS@

 INSTALL = @INSTALL@

diff -Nru libmysql/Makefile.shared libmysql/Makefile.shared

--- libmysql/Makefile.shared	2011-05-27 11:02:47.000000000 +0200

+++ libmysql/Makefile.shared	2011-05-27 10:50:57.000000000 +0200

@@ -89,7 +89,8 @@

 			-DDEFAULT_HOME_ENV=MYSQL_HOME \

 			-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \

 			-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \

-			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)

+			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" -DDISABLE_DTRACE \

+			$(target_defs)

 if HAVE_YASSL

 yassl_las = $(top_builddir)/extra/yassl/src/libyassl.la \

diff -Nru libmysql_r/Makefile.in libmysql_r/Makefile.in

--- libmysql_r/Makefile.in	2011-05-27 11:03:55.000000000 +0200

+++ libmysql_r/Makefile.in	2011-05-27 10:52:01.000000000 +0200

@@ -87,6 +87,7 @@

 	$(top_srcdir)/config/ac-macros/check_cpu.m4 \

 	$(top_srcdir)/config/ac-macros/character_sets.m4 \

 	$(top_srcdir)/config/ac-macros/compiler_flag.m4 \

+	$(top_srcdir)/config/ac-macros/dtrace.m4 \

 	$(top_srcdir)/config/ac-macros/plugins.m4 \

 	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \

 	$(top_srcdir)/config/ac-macros/large_file.m4 \

@@ -184,13 +185,16 @@

 			-DDEFAULT_HOME_ENV=MYSQL_HOME \

 			-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \

 			-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \

-			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)

+			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" -DDISABLE_DTRACE \

+			$(target_defs)

 DEPDIR = @DEPDIR@

 DIFF = @DIFF@

 DOT_FRM_VERSION = @DOT_FRM_VERSION@

 DOXYGEN = @DOXYGEN@

 DSYMUTIL = @DSYMUTIL@

+DTRACE = @DTRACE@

+DTRACEFLAGS = @DTRACEFLAGS@

 DUMPBIN = @DUMPBIN@

 DVIS = @DVIS@

 ECHO_C = @ECHO_C@

@@ -203,6 +207,7 @@

 GETCONF = @GETCONF@

 GREP = @GREP@

 GXX = @GXX@

+HAVE_DTRACE = @HAVE_DTRACE@

 HOSTNAME = @HOSTNAME@

 INNODB_DYNAMIC_CFLAGS = @INNODB_DYNAMIC_CFLAGS@

 INSTALL = @INSTALL@

diff -Nru mysys/Makefile.am mysys/Makefile.am

--- mysys/Makefile.am	2011-05-27 11:02:47.000000000 +0200

+++ mysys/Makefile.am	2011-05-27 10:50:57.000000000 +0200

@@ -126,5 +126,21 @@

 	$(LINK) $(FLAGS) -DMAIN  ./test_base64.c $(LDADD) $(LIBS)

 	$(RM) -f ./test_base64.c

+if HAVE_DTRACE_DASH_G

+abs_top_srcdir = @abs_top_srcdir@

+libmysys_a_LIBADD += probes_mysql.o

+libmysys_a_DEPENDENCIES += probes_mysql.o dtrace_files dtrace_providers

+CLEANFILES = probes_mysql.o dtrace_files dtrace_providers

+DTRACEFILES = mf_keycache.o

+DTRACEPROVIDER = $(abs_top_srcdir)/sql/probes_mysql.d

+

+dtrace_files:

+	echo $(DTRACEFILES) > $@

+dtrace_providers:

+	echo $(DTRACEPROVIDER) > $@

+probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)

+	$(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@

+endif

+

 # Don't update the files from bitkeeper

 %::SCCS/s.%

diff -Nru mysys/Makefile.in mysys/Makefile.in

--- mysys/Makefile.in	2011-05-27 11:03:56.000000000 +0200

+++ mysys/Makefile.in	2011-05-27 10:52:02.000000000 +0200

@@ -49,6 +49,8 @@

 build_triplet = @build@

 host_triplet = @host@

 target_triplet = @target@

+@HAVE_DTRACE_DASH_G_TRUE@am__append_1 = probes_mysql.o

+@HAVE_DTRACE_DASH_G_TRUE@am__append_2 = probes_mysql.o dtrace_files dtrace_providers

 subdir = mysys

 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \

 	$(srcdir)/Makefile.in ChangeLog

@@ -57,6 +59,7 @@

 	$(top_srcdir)/config/ac-macros/check_cpu.m4 \

 	$(top_srcdir)/config/ac-macros/character_sets.m4 \

 	$(top_srcdir)/config/ac-macros/compiler_flag.m4 \

+	$(top_srcdir)/config/ac-macros/dtrace.m4 \

 	$(top_srcdir)/config/ac-macros/plugins.m4 \

 	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \

 	$(top_srcdir)/config/ac-macros/large_file.m4 \

@@ -201,6 +204,8 @@

 DOT_FRM_VERSION = @DOT_FRM_VERSION@

 DOXYGEN = @DOXYGEN@

 DSYMUTIL = @DSYMUTIL@

+DTRACE = @DTRACE@

+DTRACEFLAGS = @DTRACEFLAGS@

 DUMPBIN = @DUMPBIN@

 DVIS = @DVIS@

 ECHO_C = @ECHO_C@

@@ -213,6 +218,7 @@

 GETCONF = @GETCONF@

 GREP = @GREP@

 GXX = @GXX@

+HAVE_DTRACE = @HAVE_DTRACE@

 HOSTNAME = @HOSTNAME@

 INNODB_DYNAMIC_CFLAGS = @INNODB_DYNAMIC_CFLAGS@

 INSTALL = @INSTALL@

@@ -324,6 +330,7 @@

 abs_builddir = @abs_builddir@

 abs_srcdir = @abs_srcdir@

 abs_top_builddir = @abs_top_builddir@

+@HAVE_DTRACE_DASH_G_TRUE@abs_top_srcdir = @abs_top_srcdir@

 abs_top_srcdir = @abs_top_srcdir@

 ac_ct_CC = @ac_ct_CC@

 ac_ct_CXX = @ac_ct_CXX@

@@ -504,11 +511,14 @@

 			CMakeLists.txt mf_soundex.c \

 			my_conio.c my_wincond.c my_winthread.c

-libmysys_a_LIBADD = @THREAD_LOBJECTS@

-libmysys_a_DEPENDENCIES = @THREAD_LOBJECTS@

+libmysys_a_LIBADD = @THREAD_LOBJECTS@ $(am__append_1)

+libmysys_a_DEPENDENCIES = @THREAD_LOBJECTS@ $(am__append_2)

 # I hope this always does the right thing. Otherwise this is only test programs

 FLAGS = $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@

+@HAVE_DTRACE_DASH_G_TRUE@CLEANFILES = probes_mysql.o dtrace_files dtrace_providers

+@HAVE_DTRACE_DASH_G_TRUE@DTRACEFILES = mf_keycache.o

+@HAVE_DTRACE_DASH_G_TRUE@DTRACEPROVIDER = $(abs_top_srcdir)/sql/probes_mysql.d

 all: all-am

 .SUFFIXES:

@@ -836,6 +846,7 @@

 mostlyclean-generic:

 clean-generic:

+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

 distclean-generic:

 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

@@ -969,6 +980,13 @@

 	$(LINK) $(FLAGS) -DMAIN  ./test_base64.c $(LDADD) $(LIBS)

 	$(RM) -f ./test_base64.c

+@HAVE_DTRACE_DASH_G_TRUE@dtrace_files:

+@HAVE_DTRACE_DASH_G_TRUE@	echo $(DTRACEFILES) > $@

+@HAVE_DTRACE_DASH_G_TRUE@dtrace_providers:

+@HAVE_DTRACE_DASH_G_TRUE@	echo $(DTRACEPROVIDER) > $@

+@HAVE_DTRACE_DASH_G_TRUE@probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)

+@HAVE_DTRACE_DASH_G_TRUE@	$(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@

+

 # Don't update the files from bitkeeper

 %::SCCS/s.%

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

diff -Nru mysys/mf_keycache.c mysys/mf_keycache.c

--- mysys/mf_keycache.c	2011-05-27 11:02:47.000000000 +0200

+++ mysys/mf_keycache.c	2011-05-27 10:50:57.000000000 +0200

@@ -109,6 +109,7 @@

 #include <my_bit.h>

 #include <errno.h>