Upmerge 5.0-build -> 5.1-build.

d609fdf9 · Joerg Bruehe · d4aa9e87 · b80e34fe · d609fdf9 · d609fdf9
Commit d609fdf9 authored Sep 28, 2009 by Joerg Bruehe
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

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

configure.in configure.in +2 -1

No files found.
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -1534,7 +1534,7 @@ void show_diff(DYNAMIC_STRING* ds,
  else
    diff_name = 0;
 #else
-  diff_name = "diff";		// Otherwise always assume it's called diff
+  diff_name = "diff";           /* Otherwise always assume it's called diff */
 #endif

  if (diff_name)

--- a/configure.in
+++ b/configure.in
@@ -1648,13 +1648,14 @@ then
  DEBUG_OPTIMIZE_CXX="-O"
  OPTIMIZE_CXXFLAGS="$MAX_CXX_OPTIMIZE"
 else
-  DEBUG_CXXFLAGS="-g"
  DEBUG_OPTIMIZE_CXX=""
  case $SYSTEM_TYPE in
    *solaris*)
+      DEBUG_CXXFLAGS="-g0"
      OPTIMIZE_CXXFLAGS="-O1"
      ;;
    *)
+      DEBUG_CXXFLAGS="-g"
      OPTIMIZE_CXXFLAGS="-O"
      ;;
  esac