diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-01-30 15:57:02 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-01-30 15:57:02 +0200 |
| commit | bae06d9d452dd8089f8e06e5c95bf5b731334248 (patch) | |
| tree | 10e1fa8f9ce3a83337290b9172914c0da7eda0cc /client | |
| parent | 3aec7ca4156e8427cec829d6d392e345d15ba20d (diff) | |
| parent | dd8c492801b833444db7890e15df4f4f2c8afd1e (diff) | |
| download | mariadb-git-bae06d9d452dd8089f8e06e5c95bf5b731334248.tar.gz | |
merged 5.0-bugteam -> 5.1-bugteam
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 107848d6777..89b9c78a049 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1496,12 +1496,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 +#endif if (have_diff) { |