- mysql patch: don't use stupid optimizations like -O6

Changed files:
    mysql-opt.patch -> 1.2

diff --git a/mysql-opt.patch b/mysql-opt.patch
index d1052ad6ae93d6e24ec03c19739228376686c6fe..462f67b67e2c7a35d7e308ba8c08eb4243d8ef4a 100644 (file)
--- a/mysql-opt.patch
+++ b/mysql-opt.patch
@@ -1,32 +1,26 @@
---- mysql-3.22.32/configure.in~        Mon Dec 25 03:02:53 2000
-+++ mysql-3.22.32/configure.in Mon Dec 25 03:04:54 2000
-@@ -879,27 +879,8 @@
- AC_SYS_RESTARTABLE_SYSCALLS
+--- mysql-3.23.32/configure.in.orig    Sat Feb 10 02:57:16 2001
++++ mysql-3.23.32/configure.in Sat Feb 10 03:21:04 2001
+@@ -1094,17 +1094,17 @@
+ if test "$with_debug" = "yes"
+ then
+   # Medium debug.
+-  CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS"
+-  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"
++  CFLAGS="-DDBUG_ON -DSAFE_MUTEX $CFLAGS"
++  CXXFLAGS="-DSAFE_MUTEX $CXXFLAGS"
+ elif test "$with_debug" = "full"
+ then
+   # Full debug. Very slow in some cases
+-  CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"
+-  CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"
++  CFLAGS="-DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"
++  CXXFLAGS="-DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"
+ else
+   # Optimized version. No debug
+-  CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"
+-  CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"
++  CFLAGS="-DDBUG_OFF $CFLAGS"
++  CXXFLAGS="-DDBUG_OFF $CXXFLAGS"
+ fi
  
- # Build optimized or debug version ?
--# First check for gcc and g++
--if test "$ac_cv_prog_gcc" = "yes"
--then
--  DEBUG_CFLAGS="-g"
--  DEBUG_OPTIMIZE_CC="-O"
--  OPTIMIZE_CFLAGS="-O6"
--else
--  DEBUG_CFLAGS="-g"
--  DEBUG_OPTIMIZE_CC=""
--  OPTIMIZE_CFLAGS="-O"
--fi
--if test "$ac_cv_prog_cxx_g" = "yes"
--then
--  DEBUG_CXXFLAGS="-g"
--  DEBUG_OPTIMIZE_CXX="-O"
--  OPTIMIZE_CXXFLAGS="-O3"
--else
--  DEBUG_CXXFLAGS="-g"
--  DEBUG_OPTIMIZE_CXX=""
--  OPTIMIZE_CXXFLAGS="-O"
--fi
-+DEBUG_CFLAGS="-g"
-+DEBUG_CXXFLAGS="-g"
- AC_ARG_WITH(debug,
-     [  --without-debug          Build a production version without debugging code],
-     [with_debug=$withval],
+ # Force static compilation to avoid linking probles/get more speed