merged 5.0-bugteam -> 5.1-bugteam

83c5317a · Georgi Kodinov · 87eb2cb9 · bb31fd59 · 83c5317a
Commit 83c5317a authored Jan 30, 2009 by Georgi Kodinov
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

client/mysqltest.cc client/mysqltest.cc +4 -1

No files found.
--- 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)
  {