database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Upmerge 5.0-build -> 5.1-build.

Browse Source
This commit is contained in:
Joerg Bruehe
2009-09-28 11:07:31 +02:00
parent d4aa9e8763 b80e34fe00
commit d609fdf98b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysqltest.cc
View File

@ -1534,7 +1534,7 @@ void show_diff(DYNAMIC_STRING* ds,
else else
diff_name = 0; diff_name = 0;
#else #else
diff_name = "diff"; // Otherwise always assume it's called diff diff_name = "diff"; /* Otherwise always assume it's called diff */
#endif #endif
if (diff_name) if (diff_name)

3
configure.in
View File

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