diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-03-22 14:16:09 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-03-22 14:16:09 +0200 |
| commit | 46db8aac44737fc9b8b07283140c6d0add4d1789 (patch) | |
| tree | ba0081fdba288f6a0a7e37d4cca041bc92cbdfdf /BUILD | |
| parent | 806ec1b06206bb4f1ee41087b09c475be67d449d (diff) | |
| download | mariadb-git-46db8aac44737fc9b8b07283140c6d0add4d1789.tar.gz | |
Apply patch by Antony Dovgal:
- Move SAFE_MUTEX to be stored in config.h by configure.in (not as a flag used with compiler command line)
- Generate my_config.h in configure
BUILD/SETUP.sh:
Remove -DSAFE_MUTEX as the following --with-debug flag will automaticly add it
BUILD/compile-ia64-debug-max:
Remove -DSAFE_MUTEX as the following --with-debug flag will automaticly add it
configure.in:
Move SAFE_MUTEX and SAFE_MALLOC to [my_] config.h
Generate my_config.h as part of configure process
dbug/dbug.c:
Include my_global.h before we undef SAFE_MUTEX
include/Makefile.am:
Update comment. For now, lets generate my_config.h if someone deletes it after configure
mysys/my_wincond.c:
Include my_global.h before we undef SAFE_MUTEX
mysys/my_winthread.c:
Include my_global.h before we undef SAFE_MUTEX
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/SETUP.sh | 2 | ||||
| -rwxr-xr-x | BUILD/compile-ia64-debug-max | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index a4dc75f50fb..12f80c40e9f 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -124,7 +124,7 @@ valgrind_flags="$valgrind_flags -DMYSQL_SERVER_SUFFIX=-valgrind-max" # # Used in -debug builds debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS " -debug_cflags="$debug_cflags -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX" +debug_cflags="$debug_cflags -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC" error_inject="--with-error-inject " # # Base C++ flags for all builds diff --git a/BUILD/compile-ia64-debug-max b/BUILD/compile-ia64-debug-max index 123bfb06300..67a04bf5f62 100755 --- a/BUILD/compile-ia64-debug-max +++ b/BUILD/compile-ia64-debug-max @@ -4,5 +4,5 @@ gmake -k maintainer-clean || true path=`dirname $0` . "$path/autorun.sh" -CC=ecc CFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" CXX=ecc CXXFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" ./configure --prefix=/usr/local/mysql --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static --with-debug --with-innodb --with-embedded-server --with-archive-storage-engine +CC=ecc CFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -O2" CXX=ecc CXXFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -O2" ./configure --prefix=/usr/local/mysql --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static --with-debug --with-innodb --with-embedded-server --with-archive-storage-engine gmake |