diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index aaa08441e510c40f19bb924096c117a660b2a37d..05cf919a30c51e4222778d91b3ff184e9c657314 100644
--- 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)
diff --git a/configure.in b/configure.in
index d1757f7d8f19b64f95907fbee0085dd29e94fdca..11d8985bcdce361e98a03770ee4d80de549fbd50 100644
--- 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