diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-01-28 14:14:05 +0100 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-01-28 14:14:05 +0100 |
| commit | 36118ca6a1f66f296566d5cba9d5510ee73a61a5 (patch) | |
| tree | 04d78386298dd5cb465a8e5a5b9f899c6538eeb7 /client | |
| parent | e610f61d0e9f679a195b851fbef81ec0c48f340e (diff) | |
| download | mariadb-git-36118ca6a1f66f296566d5cba9d5510ee73a61a5.tar.gz | |
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
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 9 |
1 files changed, 8 insertions, 1 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; } } } |