diff options
| author | unknown <ingo@mysql.com> | 2005-01-26 15:51:46 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-01-26 15:51:46 +0100 |
| commit | 01e845989558236340b14c3a4b17c8d171736203 (patch) | |
| tree | 529f781833794ea64fd20c882773a307e9bf1095 /BUILD/SETUP.sh | |
| parent | a496ad3fb69fe5db76f1bd73b8c06199bc1bcb6d (diff) | |
| parent | fee6edd9645a0e0dd461efd2618a5f189cf170f3 (diff) | |
| download | mariadb-git-01e845989558236340b14c3a4b17c8d171736203.tar.gz | |
Merge from 4.1
Archive fix by Ingo.
Innodb compile fix by Monty.
configure.in:
Auto merged
innobase/include/univ.i:
Auto merged
BUILD/SETUP.sh:
Auto merged
mysql-test/t/archive.test:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/examples/ha_archive.h:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_select.cc:
Auto merged
innobase/fil/fil0fil.c:
Merged Montys fix.
Diffstat (limited to 'BUILD/SETUP.sh')
| -rwxr-xr-x[-rw-r--r--] | BUILD/SETUP.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index fa20fd14571..215d7ba24b9 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 |