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

10 files changed, 3 insertions, 246 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
 
diff --git a/configure.in b/configure.in
index 14a20322e69..44f8ef5d527 100644
--- a/configure.in
+++ b/configure.in
@@ -32,7 +32,6 @@ sinclude(config/ac-macros/check_cpu.m4)
 sinclude(config/ac-macros/character_sets.m4)
 sinclude(config/ac-macros/compiler_flag.m4)
 sinclude(config/ac-macros/plugins.m4)
-sinclude(config/ac-macros/ha_berkeley.m4)
 sinclude(config/ac-macros/ha_ndbcluster.m4)
 sinclude(config/ac-macros/large_file.m4)
 sinclude(config/ac-macros/misc.m4)
@@ -2139,12 +2138,6 @@ MYSQL_CHECK_SSL
 # functions tested above
 #--------------------------------------------------------------------
 
-MYSQL_STORAGE_ENGINE(berkeley,  berkeley-db, [BerkeleyDB Storage Engine],
-        [Transactional Tables using BerkeleyDB], [max,max-no-ndb])
-MYSQL_PLUGIN_DIRECTORY(berkeley,[storage/bdb])
-MYSQL_PLUGIN_STATIC(berkeley,   [[\$(bdb_libs_with_path)]])
-MYSQL_PLUGIN_ACTIONS(berkeley,  [MYSQL_SETUP_BERKELEY_DB])
-
 MYSQL_STORAGE_ENGINE(blackhole,,[Blackhole Storage Engine],
         [Basic Write-only Read-never tables], [max,max-no-ndb])
 MYSQL_PLUGIN_DIRECTORY(blackhole, [storage/blackhole])
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index befbd3fad3a..7fddfee51f0 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -98,7 +98,7 @@ endif
 # Storage engine specific compilation options
 
 ha_berkeley.o:  ha_berkeley.cc
-		$(CXXCOMPILE) @bdb_includes@ $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
 
 ha_ndbcluster.o:ha_ndbcluster.cc
 		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
diff --git a/sql/Makefile.am b/sql/Makefile.am
index e453bd6010f..f3f0ffe752b 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -162,7 +162,7 @@ lex_hash.h:	gen_lex_hash$(EXEEXT)
 
 # the following three should eventually be moved out of this directory
 ha_berkeley.o:	ha_berkeley.cc ha_berkeley.h
-		$(CXXCOMPILE) @bdb_includes@ $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
 
 ha_ndbcluster.o:ha_ndbcluster.cc ha_ndbcluster.h
 		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
diff --git a/storage/bdb/CMakeLists.txt b/storage/bdb/CMakeLists.txt
deleted file mode 100644
index c27665d902c..00000000000
--- a/storage/bdb/CMakeLists.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
-
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/bdb/build_win32
-                    ${CMAKE_SOURCE_DIR}/storage/bdb/dbinc
-                    ${CMAKE_SOURCE_DIR}/storage/bdb)
-
-# BDB needs a number of source files that are auto-generated by the unix
-# configure. So to build BDB, it is necessary to copy these over to the Windows
-# bitkeeper tree, or to use a source .tar.gz package which already has these
-# files.
-ADD_LIBRARY(bdb crypto/aes_method.c btree/bt_compact.c btree/bt_compare.c
-            btree/bt_conv.c btree/bt_curadj.c btree/bt_cursor.c
-            btree/bt_delete.c btree/bt_method.c btree/bt_open.c btree/bt_put.c
-            btree/bt_rec.c btree/bt_reclaim.c btree/bt_recno.c
-            btree/bt_rsearch.c btree/bt_search.c btree/bt_split.c
-            btree/bt_stat.c btree/bt_upgrade.c btree/bt_verify.c
-            btree/btree_auto.c db/crdel_auto.c db/crdel_rec.c crypto/crypto.c
-            db/db.c db/db_am.c db/db_auto.c common/db_byteorder.c db/db_cam.c
-            common/db_clock.c db/db_conv.c db/db_dispatch.c db/db_dup.c
-            common/db_err.c common/db_getlong.c common/db_idspace.c
-            db/db_iface.c db/db_join.c common/db_log2.c db/db_meta.c
-            db/db_method.c db/db_open.c db/db_overflow.c db/db_ovfl_vrfy.c
-            db/db_pr.c db/db_rec.c db/db_reclaim.c db/db_remove.c
-            db/db_rename.c db/db_ret.c env/db_salloc.c db/db_setid.c
-            db/db_setlsn.c env/db_shash.c db/db_stati.c db/db_truncate.c
-            db/db_upg.c db/db_upg_opd.c db/db_vrfy.c db/db_vrfyutil.c
-            dbm/dbm.c dbreg/dbreg.c dbreg/dbreg_auto.c dbreg/dbreg_rec.c
-            dbreg/dbreg_stat.c dbreg/dbreg_util.c env/env_failchk.c
-            env/env_file.c env/env_method.c env/env_open.c env/env_recover.c
-            env/env_region.c env/env_register.c env/env_stat.c
-            fileops/fileops_auto.c fileops/fop_basic.c fileops/fop_rec.c
-            fileops/fop_util.c hash/hash.c hash/hash_auto.c hash/hash_conv.c
-            hash/hash_dup.c hash/hash_func.c hash/hash_meta.c
-            hash/hash_method.c hash/hash_open.c hash/hash_page.c
-            hash/hash_rec.c hash/hash_reclaim.c hash/hash_stat.c
-            hash/hash_upgrade.c hash/hash_verify.c hmac/hmac.c
-            hsearch/hsearch.c lock/lock.c lock/lock_deadlock.c
-            lock/lock_failchk.c lock/lock_id.c lock/lock_list.c
-            lock/lock_method.c lock/lock_region.c lock/lock_stat.c
-            lock/lock_timer.c lock/lock_util.c log/log.c log/log_archive.c
-            log/log_compare.c log/log_debug.c log/log_get.c log/log_method.c
-            log/log_put.c log/log_stat.c mp/mp_alloc.c mp/mp_bh.c mp/mp_fget.c
-            mp/mp_fmethod.c mp/mp_fopen.c mp/mp_fput.c mp/mp_fset.c
-            mp/mp_method.c mp/mp_region.c mp/mp_register.c mp/mp_stat.c
-            mp/mp_sync.c mp/mp_trickle.c crypto/mersenne/mt19937db.c
-            mutex/mut_alloc.c mutex/mut_method.c mutex/mut_region.c
-            mutex/mut_stat.c mutex/mut_tas.c mutex/mut_win32.c
-            os_win32/os_abs.c os/os_alloc.c os_win32/os_clock.c
-            os_win32/os_config.c os_win32/os_dir.c os_win32/os_errno.c
-            os_win32/os_fid.c os_win32/os_flock.c os_win32/os_fsync.c
-            os_win32/os_handle.c os/os_id.c os_win32/os_map.c os/os_method.c
-            os/os_oflags.c os_win32/os_open.c os/os_region.c
-            os_win32/os_rename.c os/os_root.c os/os_rpath.c os_win32/os_rw.c
-            os_win32/os_seek.c os_win32/os_sleep.c os_win32/os_spin.c
-            os_win32/os_stat.c os/os_tmpdir.c os_win32/os_truncate.c
-            os/os_unlink.c qam/qam.c qam/qam_auto.c qam/qam_conv.c
-            qam/qam_files.c qam/qam_method.c qam/qam_open.c qam/qam_rec.c
-            qam/qam_stat.c qam/qam_upgrade.c qam/qam_verify.c rep/rep_auto.c
-            rep/rep_backup.c rep/rep_elect.c rep/rep_log.c rep/rep_method.c
-            rep/rep_record.c rep/rep_region.c rep/rep_stat.c rep/rep_stub.c
-            rep/rep_util.c rep/rep_verify.c crypto/rijndael/rijndael-alg-fst.c
-            crypto/rijndael/rijndael-api-fst.c hmac/sha1.c clib/strcasecmp.c
-            txn/txn.c txn/txn_auto.c txn/txn_chkpt.c txn/txn_failchk.c
-            txn/txn_method.c txn/txn_rec.c txn/txn_recover.c txn/txn_region.c
-            txn/txn_stat.c txn/txn_util.c common/util_log.c common/util_sig.c
-            xa/xa.c xa/xa_db.c xa/xa_map.c)
diff --git a/storage/bdb/LICENSE b/storage/bdb/LICENSE
deleted file mode 100644
index 87fa4cc6d1b..00000000000
--- a/storage/bdb/LICENSE
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * $Id: LICENSE,v 12.1 2005/06/16 20:20:10 bostic Exp $
- */
-
-The following is the license that applies to this copy of the Berkeley DB
-software.  For a license to use the Berkeley DB software under conditions
-other than those described here, or to purchase support for this software,
-please contact Sleepycat Software by email at info@sleepycat.com, or on
-the Web at http://www.sleepycat.com.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-/*
- * Copyright (c) 1990-2005
- *	Sleepycat Software.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Redistributions in any form must be accompanied by information on
- *    how to obtain complete source code for the DB software and any
- *    accompanying software that uses the DB software.  The source code
- *    must either be included in the distribution or be available for no
- *    more than the cost of distribution plus a nominal fee, and must be
- *    freely redistributable under reasonable conditions.  For an
- *    executable file, complete source code means the source code for all
- *    modules it contains.  It does not include source code for modules or
- *    files that typically accompany the major components of the operating
- *    system on which the executable file runs.
- *
- * THIS SOFTWARE IS PROVIDED BY SLEEPYCAT SOFTWARE ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
- * NON-INFRINGEMENT, ARE DISCLAIMED.  IN NO EVENT SHALL SLEEPYCAT SOFTWARE
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * Copyright (c) 1990, 1993, 1994, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-/*
- * Copyright (c) 1995, 1996
- *	The President and Fellows of Harvard University.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL HARVARD OR ITS CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
diff --git a/storage/bdb/Makefile.in b/storage/bdb/Makefile.in
deleted file mode 100644
index 6d7da66edf4..00000000000
--- a/storage/bdb/Makefile.in
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-# Adaptor makefile to translate between what automake expects and what
-# BDB provides (or vice versa).
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-
-# distdir and top_distdir are set by the calling Makefile
-
-bdb_build = build_unix
-files = LICENSE Makefile Makefile.in README CMakeLists.txt
-subdirs = btree build_win32 clib common cxx db dbinc \
-  dbinc_auto db185 db_archive db_checkpoint db_deadlock db_dump \
-  db_dump185 db_hotbackup db_load db_printlog db_recover db_stat db_upgrade \
-  db_verify dbm dbreg dist env fileops hash \
-  hsearch hmac include lock log mp mutex os \
-  os_win32 qam rep txn xa sequence crypto
-
-@SET_MAKE@
-
-all:
-	cd $(bdb_build) && $(MAKE) all
-
-clean:
-	cd $(bdb_build) && $(MAKE) clean
-
-distclean:
-	cd $(bdb_build) && $(MAKE) distclean
-
-# May want to fix this, and MYSQL/configure, to install things
-install dvi check installcheck:
-
-distdir:
-	for s in $(subdirs); do \
-	  cp -pr $(srcdir)/$$s $(distdir)/$$s; \
-	done
-	for f in $(files); do \
-	  test -f $(distdir)/$$f || cp -p $(srcdir)/$$f $(distdir)/$$f; \
-	done
-	mkdir $(distdir)/$(bdb_build)
-	cp -p $(srcdir)/$(bdb_build)/.IGNORE_ME $(distdir)/$(bdb_build)