# At a local mysql-trunk-bugfixing repository of davi
3161 Davi Arnaut 2010-08-01
Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled
Post-merge fix: remove --with-debug=full, it was only used for safemalloc.
removed:
BUILD/compile-pentium-mysqlfs-debug
modified:
BUILD/Makefile.am
BUILD/SETUP.sh
BUILD/build_mccge.sh
BUILD/compile-ndb-autotest
BUILD/compile-pentium-debug
BUILD/compile-pentium-debug-max
BUILD/compile-pentium-debug-max-no-ndb
BUILD/compile-pentium-debug-openssl
BUILD/compile-pentium-debug-yassl
BUILD/compile-pentium64-debug
BUILD/compile-pentium64-debug-max
CMakeLists.txt
cmake/configure.pl
config/ac-macros/ha_ndbcluster.m4
configure.in
storage/innobase/CMakeLists.txt
=== modified file 'BUILD/Makefile.am'
--- a/BUILD/Makefile.am 2010-07-22 11:30:14 +0000
+++ b/BUILD/Makefile.am 2010-08-02 00:11:01 +0000
@@ -52,7 +52,6 @@ EXTRA_DIST = FINISH.sh \
compile-pentium-icc-yassl \
compile-pentium-max \
compile-pentium-myodbc \
- compile-pentium-mysqlfs-debug \
compile-pentium-pgcc \
compile-pentium-valgrind-max \
compile-pentium64 \
=== modified file 'BUILD/SETUP.sh'
--- a/BUILD/SETUP.sh 2010-07-24 13:31:48 +0000
+++ b/BUILD/SETUP.sh 2010-08-02 00:11:01 +0000
@@ -14,7 +14,6 @@ Usage: $0 [-h|-n] [configure-options]
-h, --help Show this help message.
-n, --just-print Don't actually run any commands; just print them.
-c, --just-configure Stop after running configure.
- --with-debug=full Build with full debug.
--warning-mode=[old|pedantic|maintainer]
Influences the debug flags. Old is default.
--prefix=path Build with prefix 'path'.
@@ -30,8 +29,6 @@ parse_options()
case "$1" in
--prefix=*)
prefix=`get_key_value "$1"`;;
- --with-debug=full)
- full_debug="=full";;
--warning-mode=*)
warning_mode=`get_key_value "$1"`;;
-c | --just-configure)
@@ -60,7 +57,6 @@ fi
prefix="/usr/local/mysql"
just_print=
just_configure=
-full_debug=
warning_mode=
maintainer_mode=
@@ -116,7 +112,6 @@ else
cxx_warnings="$warnings -Wno-unused-parameter"
# cxx_warnings="$cxx_warnings -Woverloaded-virtual -Wsign-promo"
cxx_warnings="$cxx_warnings -Wctor-dtor-privacy -Wnon-virtual-dtor"
-# Added unless --with-debug=full
debug_extra_cflags="-O0 -g3 -gdwarf-2"
fi
@@ -141,11 +136,8 @@ base_cxxflags="-felide-constructors -fno
# Be as fast as we can be without losing our ability to backtrace.
fast_cflags="-O3 -fno-omit-frame-pointer"
-debug_configs="--with-debug$full_debug"
-if [ -z "$full_debug" ]
-then
- debug_cflags="$debug_cflags $debug_extra_cflags"
-fi
+debug_configs="--with-debug"
+debug_cflags="$debug_cflags $debug_extra_cflags"
#
# Configuration options.
=== modified file 'BUILD/build_mccge.sh'
--- a/BUILD/build_mccge.sh 2010-07-13 17:34:32 +0000
+++ b/BUILD/build_mccge.sh 2010-08-02 00:11:01 +0000
@@ -148,7 +148,6 @@ Usage: $0 [options]
--extended-help Show extended help message
--without-debug Build non-debug version
--with-debug Build debug version
- --with-debug=full Build with full debug.
--configure-only Stop after running configure.
--use-autotools Start by running autoconf, automake,.. tools
--no-autotools Start from configure
@@ -262,10 +261,6 @@ extended_usage()
This flag prevents the use of GPL libraries which cannot be used
under a commercial license, such as the readline library.
- --with-debug[=full]
- This option will ensure that the version is built with debug
- information enabled; the optimisation level is decreased to -O.
-
--developer
This option changes a number of things to make the version built
more appropriate to the debugging and testing needs of developers.
@@ -658,11 +653,6 @@ parse_options()
--datadir=*)
datadir=`get_key_value "$1"`
;;
- --with-debug=full)
- full_debug="=full"
- with_debug_flag="yes"
- fast_flag="no"
- ;;
--without-debug)
with_debug_flag="no"
if test "x$fast_flag" != "xyes" ; then
@@ -1044,10 +1034,7 @@ set_warning_flags()
# C++ warnings
cxx_warnings="$warnings -Woverloaded-virtual -Wsign-promo -Wreorder"
cxx_warnings="$warnings -Wctor-dtor-privacy -Wnon-virtual-dtor"
-# Added unless --with-debug=full
- if test "x$full_debug" = "x" ; then
- compiler_flags="$compiler_flags -Wuninitialized"
- fi
+ compiler_flags="$compiler_flags -Wuninitialized"
elif test "x$warning_mode" = "xpedantic" ; then
warnings="-W -Wall -ansi -pedantic -Wno-long-long -D_POSIX_SOURCE"
c_warnings="$warnings"
@@ -1113,7 +1100,7 @@ set_base_configs()
base_configs="$base_configs --localstatedir=$datadir"
fi
if test "x$with_debug_flag" = "xyes" ; then
- base_configs="$base_configs --with-debug$full_debug"
+ base_configs="$base_configs --with-debug"
fi
base_configs="$base_configs --enable-local-infile"
base_configs="$base_configs --enable-thread-safe-client"
@@ -1546,7 +1533,6 @@ gpl="yes"
version_text=
developer_flag="no"
just_configure=
-full_debug=
warning_mode=
with_flags=
error_inject_flag=
=== modified file 'BUILD/compile-ndb-autotest'
--- a/BUILD/compile-ndb-autotest 2006-08-02 07:08:21 +0000
+++ b/BUILD/compile-ndb-autotest 2010-08-02 00:11:01 +0000
@@ -4,16 +4,6 @@ path=`dirname $0`
. "$path/SETUP.sh"
extra_configs="$max_configs --with-ndb-test --with-ndb-ccflags='-DERROR_INSERT'"
-if [ "$full_debug" ]
-then
- extra_flags="$debug_cflags"
- c_warnings="$c_warnings $debug_extra_warnings"
- cxx_warnings="$cxx_warnings $debug_extra_warnings"
- extra_configs="$debug_configs $extra_configs"
-else
- extra_flags="$fast_cflags"
-fi
-
-extra_flags="$extra_flags $max_cflags -g"
+extra_flags="$fast_cflags $max_cflags -g"
. "$path/FINISH.sh"
=== modified file 'BUILD/compile-pentium-debug'
--- a/BUILD/compile-pentium-debug 2007-04-11 12:06:03 +0000
+++ b/BUILD/compile-pentium-debug 2010-08-02 00:11:01 +0000
@@ -1,7 +1,6 @@
#! /bin/sh
path=`dirname $0`
-set -- "$@" --with-debug=full
. "$path/SETUP.sh"
extra_flags="$pentium_cflags $debug_cflags"
=== modified file 'BUILD/compile-pentium-debug-max'
--- a/BUILD/compile-pentium-debug-max 2007-04-11 12:06:03 +0000
+++ b/BUILD/compile-pentium-debug-max 2010-08-02 00:11:01 +0000
@@ -1,7 +1,6 @@
#! /bin/sh
path=`dirname $0`
-set -- "$@" --with-debug=full
. "$path/SETUP.sh"
extra_flags="$pentium_cflags $debug_cflags"
=== modified file 'BUILD/compile-pentium-debug-max-no-ndb'
--- a/BUILD/compile-pentium-debug-max-no-ndb 2007-04-11 12:06:03 +0000
+++ b/BUILD/compile-pentium-debug-max-no-ndb 2010-08-02 00:11:01 +0000
@@ -1,7 +1,6 @@
#! /bin/sh
path=`dirname $0`
-set -- "$@" --with-debug=full
. "$path/SETUP.sh"
extra_flags="$pentium_cflags $debug_cflags"
=== modified file 'BUILD/compile-pentium-debug-openssl'
--- a/BUILD/compile-pentium-debug-openssl 2006-05-17 11:59:37 +0000
+++ b/BUILD/compile-pentium-debug-openssl 2010-08-02 00:11:01 +0000
@@ -6,6 +6,6 @@ path=`dirname $0`
extra_flags="$pentium_cflags $debug_cflags"
extra_configs="$pentium_configs $debug_configs"
-extra_configs="$extra_configs --with-debug=full --with-ssl=/usr"
+extra_configs="$extra_configs --with-debug --with-ssl=/usr"
. "$path/FINISH.sh"
=== modified file 'BUILD/compile-pentium-debug-yassl'
--- a/BUILD/compile-pentium-debug-yassl 2006-05-17 11:59:37 +0000
+++ b/BUILD/compile-pentium-debug-yassl 2010-08-02 00:11:01 +0000
@@ -6,6 +6,6 @@ path=`dirname $0`
extra_flags="$pentium_cflags $debug_cflags"
extra_configs="$pentium_configs $debug_configs"
-extra_configs="$extra_configs --with-debug=full --with-ssl"
+extra_configs="$extra_configs --with-debug --with-ssl"
. "$path/FINISH.sh"
=== removed file 'BUILD/compile-pentium-mysqlfs-debug'
--- a/BUILD/compile-pentium-mysqlfs-debug 2006-04-05 13:50:33 +0000
+++ b/BUILD/compile-pentium-mysqlfs-debug 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-path=`dirname $0`
-. "$path/SETUP.sh"
-
-extra_flags="$pentium_cflags $debug_cflags"
-extra_configs="$pentium_configs $debug_configs $static_link"
-
-extra_configs="$extra_configs --with-debug=full --with-mysqlfs --without-server --without-pstack"
-
-. "$path/FINISH.sh"
=== modified file 'BUILD/compile-pentium64-debug'
--- a/BUILD/compile-pentium64-debug 2007-04-11 12:06:03 +0000
+++ b/BUILD/compile-pentium64-debug 2010-08-02 00:11:01 +0000
@@ -1,7 +1,6 @@
#! /bin/sh
path=`dirname $0`
-set -- "$@" --with-debug=full
. "$path/SETUP.sh"
extra_flags="$pentium64_cflags $debug_cflags"
=== modified file 'BUILD/compile-pentium64-debug-max'
--- a/BUILD/compile-pentium64-debug-max 2007-04-11 12:06:03 +0000
+++ b/BUILD/compile-pentium64-debug-max 2010-08-02 00:11:01 +0000
@@ -1,7 +1,6 @@
#! /bin/sh
path=`dirname $0`
-set -- "$@" --with-debug=full
. "$path/SETUP.sh"
extra_flags="$pentium64_cflags $debug_cflags"
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt 2010-07-21 14:22:29 +0000
+++ b/CMakeLists.txt 2010-08-02 00:11:01 +0000
@@ -34,7 +34,6 @@ ENDIF()
SET(CUSTOM_C_FLAGS $ENV{CFLAGS})
OPTION(WITH_DEBUG "Use dbug/safemutex" OFF)
-OPTION(WITH_DEBUG_FULL "Use dbug and safemutex. Slow." OFF)
# Distinguish between community and non-community builds, with the
# default being a community build. This does not impact the feature
@@ -59,7 +58,7 @@ SET(BUILDTYPE_DOCSTRING
"Choose the type of build, options are: None(CMAKE_CXX_FLAGS or
CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel")
-IF(WITH_DEBUG OR WITH_DEBUG_FULL)
+IF(WITH_DEBUG)
SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING ${BUILDTYPE_DOCSTRING} FORCE)
SET(OLD_WITH_DEBUG 1 CACHE INTERNAL "" FORCE)
ELSEIF(NOT HAVE_CMAKE_BUILD_TYPE OR OLD_WITH_DEBUG)
@@ -201,15 +200,10 @@ ENDIF()
# Add safemutex for debug configurations, except on Windows
# (safemutex has never worked on Windows)
-IF(WITH_DEBUG OR WITH_DEBUG_FULL AND NOT WIN32)
+IF(WITH_DEBUG AND NOT WIN32)
FOREACH(LANG C CXX)
- IF(WITH_DEBUG_FULL)
- SET(CMAKE_${LANG}_FLAGS_DEBUG
- "${CMAKE_${LANG}_FLAGS_DEBUG} -DSAFE_MUTEX")
- ELSE()
- SET(CMAKE_${LANG}_FLAGS_DEBUG
- "${CMAKE_${LANG}_FLAGS_DEBUG} -DSAFE_MUTEX")
- ENDIF()
+ SET(CMAKE_${LANG}_FLAGS_DEBUG
+ "${CMAKE_${LANG}_FLAGS_DEBUG} -DSAFE_MUTEX")
ENDFOREACH()
ENDIF()
=== modified file 'cmake/configure.pl'
--- a/cmake/configure.pl 2010-07-12 16:39:00 +0000
+++ b/cmake/configure.pl 2010-08-02 00:11:01 +0000
@@ -179,11 +179,6 @@ foreach my $option (@ARGV)
$cmakeargs = $cmakeargs." -DMYSQL_DATADIR=".substr($option,14);
next;
}
- if ($option =~ /with-debug=full/)
- {
- $cmakeargs = $cmakeargs." -DWITH_DEBUG_FULL=1";
- next;
- }
if ($option =~ /mysql-maintainer-mode/)
{
$cmakeargs = $cmakeargs." -DMYSQL_MAINTAINER_MODE=" .
=== modified file 'config/ac-macros/ha_ndbcluster.m4'
--- a/config/ac-macros/ha_ndbcluster.m4 2009-03-13 11:13:55 +0000
+++ b/config/ac-macros/ha_ndbcluster.m4 2010-08-02 00:11:01 +0000
@@ -206,7 +206,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
NDB_DEFS="-DNDB_DEBUG_FULL -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"
else
# no extra ndb debug but still do asserts if debug version
- if test "$with_debug" = "yes" -o "$with_debug" = "full"
+ if test "$with_debug" = "yes"
then
NDB_DEFS=""
else
=== modified file 'configure.in'
--- a/configure.in 2010-07-29 12:32:11 +0000
+++ b/configure.in 2010-08-02 00:11:01 +0000
@@ -1732,22 +1732,14 @@ then
fi
AC_ARG_WITH(debug,
- [ --with-debug Add debug code
- --with-debug=full Add debug code (adds memory checker, very slow)],
+ [AS_HELP_STRING([--with-debug], [Add debug code @<:@default=no@:>@])]
[with_debug=$withval],
[with_debug=no])
if test "$with_debug" = "yes"
then
- # Medium debug.
AC_DEFINE([DBUG_ON], [1], [Use libdbug])
CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DSAFE_MUTEX $CFLAGS"
CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"
-elif test "$with_debug" = "full"
-then
- # Full debug. Very slow in some cases
- AC_DEFINE([DBUG_ON], [1], [Use libdbug])
- CFLAGS="$DEBUG_CFLAGS -DSAFE_MUTEX $CFLAGS"
- CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX $CXXFLAGS"
else
# Optimized version. No debug
AC_DEFINE([DBUG_OFF], [1], [Don't use libdbug])
=== modified file 'storage/innobase/CMakeLists.txt'
--- a/storage/innobase/CMakeLists.txt 2010-07-21 14:22:29 +0000
+++ b/storage/innobase/CMakeLists.txt 2010-08-02 00:11:01 +0000
@@ -43,7 +43,7 @@ ENDIF()
# Enable InnoDB's UNIV_DEBUG if MySQL's WITH_DEBUG[_FULL] is defined
# enable when this bug is resolved:
# Bug#54861 Additional connections not handled properly in mtr --embedded
-#IF(WITH_DEBUG OR WITH_DEBUG_FULL)
+#IF(WITH_DEBUG)
# ADD_DEFINITIONS("-DUNIV_DEBUG")
#ENDIF()
Attachment: [text/bzr-bundle] bzr/davi.arnaut@oracle.com-20100802001101-pmitf9lemhvsyxob.bundle
| Thread |
|---|
| • bzr commit into mysql-trunk-bugfixing branch (davi:3161) Bug#34043 | Davi Arnaut | 2 Aug |
