diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-01-30 13:21:53 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-01-30 13:21:53 +0200 |
| commit | bb31fd599252de83cd87192c95dca1196258a5b0 (patch) | |
| tree | 560679a7e86fb9f402689888772d8a7094cb3cbe | |
| parent | b367d2fd1f081ddf3d6f678b76b45fafd128b03f (diff) | |
| parent | d20a0bd43ae43f76fc023bcb079dd8eb519ead4a (diff) | |
| download | mariadb-git-bb31fd599252de83cd87192c95dca1196258a5b0.tar.gz | |
merged 5.0-main -> 5.0-bugteam
| -rw-r--r-- | client/mysqltest.c | 9 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 4 |
3 files changed, 12 insertions, 5 deletions
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; } } } 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 ? 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/. |