From e08d21b7082759dbd3be5e2ce78446cf8bd9dce7 Mon Sep 17 00:00:00 2001 From: Bjorn Munch Date: Wed, 28 Jan 2009 14:14:05 +0100 Subject: 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(-) (limited to 'client') 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; } } } -- cgit v1.2.1