Commit dd8c4928 authored by Georgi Kodinov's avatar Georgi Kodinov

merged 5.0-main -> 5.0-bugteam

parents 1622582b cf11f38c
...@@ -1385,8 +1385,15 @@ void show_diff(DYNAMIC_STRING* ds, ...@@ -1385,8 +1385,15 @@ void show_diff(DYNAMIC_STRING* ds,
/* determine if we have diff on Windows /* determine if we have diff on Windows
needs special processing due to return values needs special processing due to return values
on that OS 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(); have_diff = diff_check();
#else
have_diff = 1;
#endif
if (have_diff) if (have_diff)
{ {
...@@ -1410,7 +1417,7 @@ void show_diff(DYNAMIC_STRING* ds, ...@@ -1410,7 +1417,7 @@ void show_diff(DYNAMIC_STRING* ds,
"2>&1", "2>&1",
NULL) > 1) /* Most "diff" tools return >1 if error */ NULL) > 1) /* Most "diff" tools return >1 if error */
{ {
have_diff= 1; have_diff= 0;
} }
} }
} }
......
...@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) ...@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line! # The Docs Makefile.am parses this line!
# remember to also change ndb version below and update version.c in ndb # 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]) AM_CONFIG_HEADER([include/config.h:config.h.in])
PROTOCOL_VERSION=10 PROTOCOL_VERSION=10
...@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0 ...@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
# ndb version # ndb version
NDB_VERSION_MAJOR=5 NDB_VERSION_MAJOR=5
NDB_VERSION_MINOR=0 NDB_VERSION_MINOR=0
NDB_VERSION_BUILD=77 NDB_VERSION_BUILD=78
NDB_VERSION_STATUS="" NDB_VERSION_STATUS=""
# Set all version vars based on $VERSION. How do we do this more elegant ? # Set all version vars based on $VERSION. How do we do this more elegant ?
......
...@@ -372,8 +372,8 @@ fi ...@@ -372,8 +372,8 @@ fi
# NDB Cluster # NDB Cluster
if [ x$NDBCLUSTER = x1 ]; then if [ x$NDBCLUSTER = x1 ]; then
( cd 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 ) ( cd mysql-test/ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install pkglibdir=@pkglibdir@ )
$CP $BASE/ndb-stage@bindir@/* $BASE/bin/. $CP $BASE/ndb-stage@bindir@/* $BASE/bin/.
$CP $BASE/ndb-stage@libexecdir@/* $BASE/bin/. $CP $BASE/ndb-stage@libexecdir@/* $BASE/bin/.
$CP $BASE/ndb-stage@pkglibdir@/* $BASE/lib/. $CP $BASE/ndb-stage@pkglibdir@/* $BASE/lib/.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment