diff options
| author | unknown <monty@mysql.com> | 2005-01-26 16:07:53 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-01-26 16:07:53 +0200 |
| commit | 3c3ca269ec47566ed9a588c52c3671ca4225e53a (patch) | |
| tree | 2b90bb4ebf84a63136bafd6b3aae767628e376f5 | |
| parent | a898252a45b97a5bc3200c48bedb7471c588c712 (diff) | |
| download | mariadb-git-3c3ca269ec47566ed9a588c52c3671ca4225e53a.tar.gz | |
Only enable Innodb extra debugging when using the --debug=full configure option
BUILD/SETUP.sh:
Abort if wrong options
BUILD/compile-pentium64-debug:
Always use full debugging
innobase/fil/fil0fil.c:
Fixed wrong printf() format
| -rwxr-xr-x[-rw-r--r--] | BUILD/SETUP.sh | 8 | ||||
| -rwxr-xr-x | BUILD/compile-pentium64-debug | 2 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | innobase/fil/fil0fil.c | 6 | ||||
| -rw-r--r-- | innobase/include/univ.i | 4 |
5 files changed, 16 insertions, 8 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 5fe898878b9..77fab948121 100644..100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -25,7 +25,10 @@ Any other options will be passed directly to configure. Note: this script is intended for internal use by MySQL developers. EOF --with-debug=full ) full_debug="=full"; shift ;; - * ) break ;; + * ) + echo "Unknown option '$1'" + exit 1 + break ;; esac done @@ -62,6 +65,7 @@ fast_cflags="-O3 -fno-omit-frame-pointer" reckless_cflags="-O3 -fomit-frame-pointer " debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX" +debug_extra_cflags="-O1 -Wuninitialized" base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti" amd64_cxxflags="-DBIG_TABLES" @@ -80,7 +84,7 @@ local_infile_configs="--enable-local-infile" debug_configs="--with-debug$full_debug" if [ -z "$full_debug" ] then - debug_cflags="$debug_cflags -O1 -Wuninitialized" + debug_cflags="$debug_cflags $debug_extra_cflags" fi if gmake --version > /dev/null 2>&1 diff --git a/BUILD/compile-pentium64-debug b/BUILD/compile-pentium64-debug index 1bbca36d851..0299669f79a 100755 --- a/BUILD/compile-pentium64-debug +++ b/BUILD/compile-pentium64-debug @@ -1,7 +1,7 @@ #! /bin/sh path=`dirname $0` -. "$path/SETUP.sh" +. "$path/SETUP.sh" $@ --with-debug=full extra_flags="$pentium64_cflags $debug_cflags" c_warnings="$c_warnings $debug_extra_warnings" diff --git a/configure.in b/configure.in index 3e9ea6eebe7..985b5923c5c 100644 --- a/configure.in +++ b/configure.in @@ -1685,8 +1685,8 @@ then 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 -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS" + CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC -DUNIV_DEBUG $CFLAGS" + CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC -DUNIV_DEBUG $CXXFLAGS" else # Optimized version. No debug CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS" diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c index 5f71c00aea6..cc1c4a22983 100644 --- a/innobase/fil/fil0fil.c +++ b/innobase/fil/fil0fil.c @@ -685,9 +685,9 @@ fil_try_to_close_file_in_LRU( fputs("InnoDB: cannot close file ", stderr); ut_print_filename(stderr, node->name); fprintf(stderr, - ", because mod_count %lld != fl_count %lld\n", - node->modification_counter, - node->flush_counter); + ", because mod_count %ld != fl_count %ld\n", + (ulong) node->modification_counter, + (ulong) node->flush_counter); } node = UT_LIST_GET_PREV(LRU, node); diff --git a/innobase/include/univ.i b/innobase/include/univ.i index 625978ffc38..6ae4fe1c2ce 100644 --- a/innobase/include/univ.i +++ b/innobase/include/univ.i @@ -80,6 +80,10 @@ memory is read outside the allocated blocks. */ /* Make a non-inline debug version */ +#ifdef DBUG_ON +#define UNIV_DEBUG +#endif /* DBUG_ON */ + /* #define UNIV_DEBUG #define UNIV_MEM_DEBUG |