From e610f61d0e9f679a195b851fbef81ec0c48f340e Mon Sep 17 00:00:00 2001
From: Kent Boortz <kent@kent-amd64>
Date: Fri, 23 Jan 2009 02:59:03 +0100
Subject: [PATCH 1/3] From 5.0.48 the NDB client libraries has been missing in
 the cluster packages, this is now corrected (Bug#42278)

---
 scripts/make_binary_distribution.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index e5e08038bff..f156ea3b986 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -372,8 +372,8 @@ fi
 
 # NDB Cluster
 if [ x$NDBCLUSTER = x1 ]; then
-  ( cd ndb            ; @MAKE@ DESTDIR=$BASE/ndb-stage install )
-  ( cd mysql-test/ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install )
+  ( cd ndb            ; @MAKE@ DESTDIR=$BASE/ndb-stage install pkglibdir=@pkglibdir@ )
+  ( cd mysql-test/ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install pkglibdir=@pkglibdir@ )
   $CP $BASE/ndb-stage@bindir@/* $BASE/bin/.
   $CP $BASE/ndb-stage@libexecdir@/* $BASE/bin/.
   $CP $BASE/ndb-stage@pkglibdir@/* $BASE/lib/.

From 36118ca6a1f66f296566d5cba9d5510ee73a61a5 Mon Sep 17 00:00:00 2001
From: Bjorn Munch <Bjorn.Munch@sun.com>
Date: Wed, 28 Jan 2009 14:14:05 +0100
Subject: [PATCH 2/3] Bug #42216 mysqltest: Use of diff belonging to current
 OS, with wrong option for Solaris Check for existence of diff fails on
 Solaris due to unsupported "-v" Fix is to do this check only on Windows where
 it was needed

---
 client/mysqltest.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 62ec5a88599..d7fbb6f1f18 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -1385,8 +1385,15 @@ void show_diff(DYNAMIC_STRING* ds,
   /* determine if we have diff on Windows
      needs special processing due to return values
      on that OS
+     This test is only done on Windows since it's only needed there
+     in order to correctly detect non-availibility of 'diff', and
+     the way it's implemented does not work with default 'diff' on Solaris.
   */
+#ifdef __WIN__
   have_diff = diff_check();
+#else
+  have_diff = 1;
+#endif
 
   if (have_diff)
   {
@@ -1410,7 +1417,7 @@ void show_diff(DYNAMIC_STRING* ds,
                    "2>&1",
                    NULL) > 1) /* Most "diff" tools return >1 if error */
       {
-        have_diff= 1;
+        have_diff= 0;
       }  
     }
   }

From d20a0bd43ae43f76fc023bcb079dd8eb519ead4a Mon Sep 17 00:00:00 2001
From: Joerg Bruehe <joerg@mysql.com>
Date: Thu, 29 Jan 2009 22:43:52 +0100
Subject: [PATCH 3/3] Raise the version number in this (enterprise) tree,
 5.0.77 will be a community build.

---
 configure.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index ff0e9de9ec2..12c31b33d1b 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.0.77)
+AM_INIT_AUTOMAKE(mysql, 5.0.78)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 PROTOCOL_VERSION=10
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
 # ndb version
 NDB_VERSION_MAJOR=5
 NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=77
+NDB_VERSION_BUILD=78
 NDB_VERSION_STATUS=""
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?