diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2009-09-28 11:07:31 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2009-09-28 11:07:31 +0200 |
| commit | d609fdf98beb8e22c8da42079e08e5dd1f84e16c (patch) | |
| tree | 35a84a630756ee8c46729401b8fbf9ebcaa5b3b3 | |
| parent | d4aa9e87633f176af894193a0adb3d88a4ac6e8e (diff) | |
| parent | b80e34fe00d0cf33a17e45fc38d8c5b6b9222f0b (diff) | |
| download | mariadb-git-d609fdf98beb8e22c8da42079e08e5dd1f84e16c.tar.gz | |
Upmerge 5.0-build -> 5.1-build.
| -rw-r--r-- | client/mysqltest.cc | 2 | ||||
| -rw-r--r-- | configure.in | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index aaa08441e51..05cf919a30c 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 d1757f7d8f1..11d8985bcdc 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 |