mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 10:14:19 +01:00
merged 5.0-bugteam -> 5.1-bugteam
This commit is contained in:
commit
bae06d9d45
1 changed files with 4 additions and 1 deletions
|
@ -1496,12 +1496,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__
|
#ifdef __WIN__
|
||||||
have_diff = diff_check();
|
have_diff = diff_check();
|
||||||
#else
|
#else
|
||||||
have_diff = 1;
|
have_diff = 1;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (have_diff)
|
if (have_diff)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue