From 21bb4f9465751b3a93efca2415dc215de3c55b0f Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 9 Aug 2006 17:33:08 -0700 Subject: First stage removeal of BDB. BitKeeper/deleted/.del-CMakeLists.txt: Delete: storage/bdb/CMakeLists.txt BitKeeper/deleted/.del-LICENSE: Delete: storage/bdb/LICENSE BitKeeper/deleted/.del-Makefile.in: Delete: storage/bdb/Makefile.in BitKeeper/deleted/.del-compile-pentium-debug-no-bdb: Delete: BUILD/compile-pentium-debug-no-bdb BUILD/Makefile.am: Remove dropped file configure.in: Remove berkely from configure. BUILD/compile-dist: Remove option to build bdb BUILD/compile-solaris-sparc-purify: Remove option for bdb build libmysqld/Makefile.am: Remove option for bdb build sql/Makefile.am: Remove bdb build --- BUILD/Makefile.am | 1 - BUILD/compile-dist | 1 - BUILD/compile-pentium-debug-no-bdb | 9 --------- BUILD/compile-solaris-sparc-purify | 2 +- 4 files changed, 1 insertion(+), 12 deletions(-) delete mode 100755 BUILD/compile-pentium-debug-no-bdb (limited to 'BUILD') 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 -- cgit v1.2.1