diff options
| author | unknown <serg@serg.mysql.com> | 2001-04-13 21:16:53 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-04-13 21:16:53 +0200 |
| commit | 5128e3750d6296017ffd86497516133ee4285386 (patch) | |
| tree | 0748ec62096feda86a14c512244d6302323d8282 /BUILD | |
| parent | b5fa754f7ba4b416e608cc624c596f89a9db84fd (diff) | |
| parent | 582174606766c66b7ae474fa0671bec6c162347f (diff) | |
| download | mariadb-git-5128e3750d6296017ffd86497516133ee4285386.tar.gz | |
merged
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
acinclude.m4:
Auto merged
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/sql_delete.cc:
Auto merged
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD/SETUP.sh | 2 | ||||
| -rwxr-xr-x | BUILD/compile-pentium | 2 | ||||
| -rwxr-xr-x | BUILD/compile-pentium-debug-max | 2 | ||||
| -rw-r--r-- | BUILD/compile-pentium-max | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 5be7942e935..d1de9ab12e7 100644 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -44,7 +44,7 @@ pentium_cflags="-mpentiumpro" sparc_cflags="" fast_cflags="-O6 -fno-omit-frame-pointer" -reckless_cflags="-O6 -fomit-frame-pointer" +reckless_cflags="-O6 -fomit-frame-pointer -ffixed-ebp" debug_cflags="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DSAFE_MUTEX -O2" base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti" diff --git a/BUILD/compile-pentium b/BUILD/compile-pentium index 11559be93de..9607ca03e7e 100755 --- a/BUILD/compile-pentium +++ b/BUILD/compile-pentium @@ -3,7 +3,7 @@ path=`dirname $0` . "$path/SETUP.sh" -extra_flags="$pentium_cflags $fast_cflags" +extra_flags="$pentium_cflags $reckless_cflags" extra_configs="$pentium_configs" strip=yes diff --git a/BUILD/compile-pentium-debug-max b/BUILD/compile-pentium-debug-max index 2800ace97c5..dc88bab62d3 100755 --- a/BUILD/compile-pentium-debug-max +++ b/BUILD/compile-pentium-debug-max @@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings" cxx_warnings="$cxx_warnings $debug_extra_warnings" extra_configs="$pentium_configs $debug_configs" -extra_configs="$extra_configs --with-berkeley-db --with-innobase" +extra_configs="$extra_configs --with-berkeley-db --with-innodb" . "$path/FINISH.sh" diff --git a/BUILD/compile-pentium-max b/BUILD/compile-pentium-max index 2f63ebe13c0..5fb4c1f89d2 100644 --- a/BUILD/compile-pentium-max +++ b/BUILD/compile-pentium-max @@ -7,6 +7,6 @@ extra_flags="$pentium_cflags $fast_cflags" extra_configs="$pentium_configs" strip=yes -extra_configs="$extra_configs --with-innobase --with-berkeley-db" +extra_configs="$extra_configs --with-innodb --with-berkeley-db" . "$path/FINISH.sh" |