diff options
| author | unknown <patg@govinda.patg.net> | 2006-08-16 10:03:24 -0700 |
|---|---|---|
| committer | unknown <patg@govinda.patg.net> | 2006-08-16 10:03:24 -0700 |
| commit | a6682dcb9a5916dc2ba5d94f538a507ff73e433b (patch) | |
| tree | c720bb36b6625faf7fa0b8903bd8cc39e711d1a3 /BUILD | |
| parent | 1d3a13a95d730b8d1c9123aeeb886cee7513f80a (diff) | |
| parent | e1df39a50e75ffdc855ee38aa2d85b091d605ec1 (diff) | |
| download | mariadb-git-a6682dcb9a5916dc2ba5d94f538a507ff73e433b.tar.gz | |
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
mysql-test/r/warnings.result:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
BitKeeper/deleted/.del-ps_6bdb.result:
Auto merged
sql/share/errmsg.txt:
SCCS merged
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD/Makefile.am | 1 | ||||
| -rwxr-xr-x | BUILD/compile-dist | 1 | ||||
| -rwxr-xr-x | BUILD/compile-pentium-debug-no-bdb | 9 | ||||
| -rwxr-xr-x | BUILD/compile-solaris-sparc-purify | 2 |
4 files changed, 1 insertions, 12 deletions
diff --git a/BUILD/Makefile.am b/BUILD/Makefile.am index a5f3623c25e..667d7c396b3 100644 --- a/BUILD/Makefile.am +++ b/BUILD/Makefile.am @@ -38,7 +38,6 @@ EXTRA_DIST = FINISH.sh \ compile-pentium-debug-max \ compile-pentium-debug-max-no-embedded \ compile-pentium-debug-max-no-ndb \ - compile-pentium-debug-no-bdb \ compile-pentium-debug-openssl \ compile-pentium-debug-yassl \ compile-pentium-gcov \ diff --git a/BUILD/compile-dist b/BUILD/compile-dist index 15032d79d78..874500977b7 100755 --- a/BUILD/compile-dist +++ b/BUILD/compile-dist @@ -52,7 +52,6 @@ fi --with-csv-storage-engine \ --with-example-storage-engine \ --with-federated-storage-engine \ - --with-berkeley-db \ --with-innodb \ --with-ssl \ --enable-thread-safe-client \ diff --git a/BUILD/compile-pentium-debug-no-bdb b/BUILD/compile-pentium-debug-no-bdb deleted file mode 100755 index d7e70f868cc..00000000000 --- a/BUILD/compile-pentium-debug-no-bdb +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -path=`dirname $0` -. "$path/SETUP.sh" - -extra_flags="$pentium_cflags $debug_cflags" -extra_configs="$pentium_configs $debug_configs --without-berkeley-db $static_link" - -. "$path/FINISH.sh" diff --git a/BUILD/compile-solaris-sparc-purify b/BUILD/compile-solaris-sparc-purify index 29cf5671432..8c24b0db98c 100755 --- a/BUILD/compile-solaris-sparc-purify +++ b/BUILD/compile-solaris-sparc-purify @@ -37,7 +37,7 @@ gmake -k clean || true path=`dirname $0` . "$path/autorun.sh" -CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-berkeley-db --with-embedded-server --with-innodb $EXTRA_CONFIG_FLAGS +CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-embedded-server --with-innodb $EXTRA_CONFIG_FLAGS gmake -j 4 |