From 51eff4b3206d99620893f881e58f47d8db0cfa47 Mon Sep 17 00:00:00 2001
From: Alexander Nozdrin <alik@ibmvm>
Date: Fri, 9 Oct 2009 13:26:26 +0400
Subject: [PATCH 1/2] Pull from mysql-trunk.

---
 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 60a583fa25b..5317b137545 100644
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
 #
 # When changing major version number please also check switch statement
 # in client/mysqlbinlog.cc:check_master_version().
-AM_INIT_AUTOMAKE(mysql, 5.4.5-beta)
+AM_INIT_AUTOMAKE(mysql, 5.5.0-beta)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 PROTOCOL_VERSION=10

From e745ae7927ff1a9a8d7e6c71898177daec8a0cc0 Mon Sep 17 00:00:00 2001
From: Jonathan Perkin <jperkin@sun.com>
Date: Wed, 14 Oct 2009 12:15:46 +0100
Subject: [PATCH 2/2] bug#45810: DTrace: build fails when 'dtrace' is not in
 PATH

Ensure full path to dtrace binary is used, fixes builds where
/usr/sbin is not in $PATH.
---
 config/ac-macros/dtrace.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/ac-macros/dtrace.m4 b/config/ac-macros/dtrace.m4
index d0570a5faf5..a42d78d97fe 100644
--- a/config/ac-macros/dtrace.m4
+++ b/config/ac-macros/dtrace.m4
@@ -14,7 +14,7 @@ DTRACEFLAGS=""
 HAVE_DTRACE=""
 HAVE_DTRACE_DASH_G=""
 if test "$ENABLE_DTRACE" = "yes"; then
-  AC_CHECK_PROGS(DTRACE, dtrace, [not found], [$PATH:/usr/sbin])
+  AC_PATH_PROGS(DTRACE, dtrace, [not found], [$PATH:/usr/sbin])
   if test "$DTRACE" = "not found"; then
     ENABLE_DTRACE="no"
   else