Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1

into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1

BUILD/FINISH.sh

@@ -5,7 +5,7 @@ configure="./configure $base_configs $extra_configs"
 
 commands="\
 $make -k distclean || true 
-/bin/rm -rf */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache bdb/dist/autom4te.cache autom4te.cache innobase/autom4te.cache;
+/bin/rm -rf */.deps/*.P config.cache storage/innobase/config.cache autom4te.cache innobase/autom4te.cache;
 
 path=`dirname $0`
 . \"$path/autorun.sh\""

BUILD/compile-alpha-cxx

@@ -1,7 +1,7 @@
 /bin/rm -f */.deps/*.P */*.o
 make -k clean
 /bin/rm -f */.deps/*.P */*.o
-/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache mysql-*.tar.gz
+/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache mysql-*.tar.gz
 
 path=`dirname $0`
 . "$path/autorun.sh"

BUILD/compile-alpha-debug

@@ -1,7 +1,7 @@
 /bin/rm -f */.deps/*.P */*.o
 make -k clean
 /bin/rm -f */.deps/*.P */*.o
-/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache mysql-*.tar.gz
+/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache mysql-*.tar.gz
 
 path=`dirname $0`
 . "$path/autorun.sh"

BUILD/compile-dist

@@ -7,7 +7,6 @@
 # package" that is used as the basis for all other binary builds.
 #
 test -f Makefile && make distclean
-(cd storage/bdb/dist && sh s_all)
 (cd storage/innobase && aclocal && autoheader && \
     libtoolize --automake --force --copy && \
     automake --force --add-missing --copy && autoconf)

BUILD/compile-ia64-debug-max

@@ -1,5 +1,5 @@
 gmake -k clean || true 
-/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache
+/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache
 
 path=`dirname $0`
 . "$path/autorun.sh"

CMakeLists.txt

@@ -49,10 +49,6 @@ IF(WITH_FEDERATED_STORAGE_ENGINE)
   ADD_DEFINITIONS(-D WITH_FEDERATED_STORAGE_ENGINE)
   SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_federated_plugin")
 ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
-IF(WITH_BERKELEY_STORAGE_ENGINE)
-  ADD_DEFINITIONS(-D WITH_BERKELEY_STORAGE_ENGINE)
-  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_berkeley_plugin")
-ENDIF(WITH_BERKELEY_STORAGE_ENGINE)
 
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in 
                ${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc @ONLY)

Makefile.am

@@ -39,11 +39,7 @@ BUILT_SOURCES = linked_client_sources linked_server_sources \
 		 @linked_libmysqld_targets@ \
 		 linked_include_sources @linked_netware_sources@
 
-# The db.h file is a bit special, see note in "configure.in".
+CLEANFILES = $(BUILT_SOURCES)
-# In the case we didn't compile with bdb, a dummy file is put
-# there, but will not be removed by the bdb make file becuase
-# it will never be called.
-CLEANFILES = $(BUILT_SOURCES) bdb/build_unix/db.h
 DISTCLEANFILES = ac_available_languages_fragment
 
 linked_include_sources:

config/ac-macros/ha_berkeley.m4

@@ -1,263 +0,0 @@
-dnl ---------------------------------------------------------------------------
-dnl Macro: MYSQL_CHECK_BDB
-dnl Sets HAVE_BERKELEY_DB if inst library is found
-dnl Makes sure db version is correct.
-dnl Looks in $srcdir for Berkeley distribution if not told otherwise
-dnl ---------------------------------------------------------------------------
-
-
-AC_DEFUN([MYSQL_SETUP_BERKELEY_DB], [
-  AC_ARG_WITH([berkeley-db],
-              AS_HELP_STRING([--with-berkeley-db[[[[[=DIR]]]]]],
-                             [Use BerkeleyDB located in DIR]),
-              [bdb="$withval"],
-              [bdb=yes])
-
-  AC_ARG_WITH([berkeley-db-includes],
-              AS_HELP_STRING([--with-berkeley-db-includes=DIR],
-                             [Find Berkeley DB headers in DIR]),
-              [bdb_includes="$withval"],
-              [bdb_includes=default])
-
-  AC_ARG_WITH([berkeley-db-libs],
-              AS_HELP_STRING([--with-berkeley-db-libs=DIR],
-                             [Find Berkeley DB libraries in DIR]),
-              [bdb_libs="$withval"],
-              [bdb_libs=default])
-
-	#  echo " bdb $bdb  $bdb_includes---$bdb_libs "
-  case "$bdb" in
-    yes )
-      case "$bdb_includes---$bdb_libs" in
-        default---default )
-          mode=search-$bdb
-          ;;
-        default---* | *---default | yes---* | *---yes )
-          AC_MSG_ERROR([if either 'includes' or 'libs' is specified, both must be specified])
-          ;;
-        * )
-          mode=supplied-two
-          ;;
-      esac
-      ;;
-    * )
-      mode=supplied-one
-      ;;
-  esac
-
-  case $mode in
-    supplied-two )
-      MYSQL_CHECK_INSTALLED_BDB([$bdb_includes], [$bdb_libs])
-      case $bdb_dir_ok in
-        installed ) mode=yes ;;
-        * ) AC_MSG_ERROR([didn't find valid BerkeleyDB: $bdb_dir_ok]) ;;
-      esac
-      ;;
-    supplied-one )
-      MYSQL_CHECK_BDB_DIR([$bdb])
-      case $bdb_dir_ok in
-        source ) mode=compile ;;
-        installed ) mode=yes ;;
-        * ) AC_MSG_ERROR([didn't find valid BerkeleyDB: $bdb_dir_ok]) ;;
-      esac
-      ;;
-    search-* )
-      MYSQL_SEARCH_FOR_BDB
-      case $bdb_dir_ok in
-        source ) mode=compile ;;
-        installed ) mode=yes ;;
-        * ) AC_MSG_ERROR([no suitable BerkeleyDB found]) ;;
-      esac
-      ;;
-    *)
-      AC_MSG_ERROR([impossible case condition '$mode': please report this to bugs@lists.mysql.com])
-      ;;
-  esac
-
-  case $mode in
-    yes )
-      have_berkeley_db="yes"
-      AC_MSG_RESULT([Using Berkeley DB in '$bdb_includes'])
-      ;;
-    compile )
-      have_berkeley_db="$bdb"
-      AC_MSG_RESULT([Compiling Berekeley DB in '$have_berkeley_db'])
-      ;;
-    * )
-      AC_MSG_ERROR([impossible case condition '$mode': please report this to bugs@lists.mysql.com])
-      ;;
-  esac
-
-      bdb_conf_flags="--disable-shared --build=$build_alias"
-      if test $with_debug = "yes"
-      then
-        bdb_conf_flags="$bdb_conf_flags --enable-debug --enable-diagnostic"
-      fi
-      # NOTICE: if you're compiling BDB, it needs to be a SUBDIR
-      # of $srcdir (i.e., you can 'cd $srcdir/$bdb').  It won't
-      # work otherwise.
-      if test -d "$bdb"; then :
-      else
-        # This should only happen when doing a VPATH build
-        echo "NOTICE: I have to make the BDB directory: `pwd`:$bdb"
-        mkdir "$bdb" || exit 1
-      fi
-      if test -d "$bdb"/build_unix; then :
-      else
-        # This should only happen when doing a VPATH build
-        echo "NOTICE: I have to make the build_unix directory: `pwd`:$bdb/build_unix"
-        mkdir "$bdb/build_unix" || exit 1
-      fi
-      rel_srcdir=
-      case "$srcdir" in
-        /* ) rel_srcdir="$srcdir" ;;
-        * )  rel_srcdir="../../../$srcdir" ;;
-      esac
-      (cd $bdb/build_unix && \
-       sh $rel_srcdir/$bdb/dist/configure $bdb_conf_flags) || \
-        AC_MSG_ERROR([could not configure Berkeley DB])
- 
-  AC_SUBST(bdb_includes)
-  AC_SUBST(bdb_libs)
-  AC_SUBST(bdb_libs_with_path)
-])
-
-AC_DEFUN([MYSQL_CHECK_INSTALLED_BDB], [
-dnl echo ["MYSQL_CHECK_INSTALLED_BDB ($1) ($2)"]
-  inc="$1"
-  lib="$2"
-  if test -f "$inc/db.h"
-  then
-    MYSQL_CHECK_BDB_VERSION([$inc/db.h],
-      [.*#define[ 	]*], [[ 	][ 	]*])
-
-    if test X"$bdb_version_ok" = Xyes; then
-      save_LDFLAGS="$LDFLAGS"
-      LDFLAGS="-L$lib $LDFLAGS"
-      AC_CHECK_LIB(db,db_env_create, [
-        bdb_dir_ok=installed
-        MYSQL_TOP_BUILDDIR([inc])
-        MYSQL_TOP_BUILDDIR([lib])
-        bdb_includes="-I$inc"
-        bdb_libs="-L$lib -ldb"
-        bdb_libs_with_path="$lib/libdb.a"
-      ])
-      LDFLAGS="$save_LDFLAGS"
-    else
-      bdb_dir_ok="$bdb_version_ok"
-    fi
-  else
-    bdb_dir_ok="no db.h file in '$inc'"
-  fi
-])
-
-AC_DEFUN([MYSQL_CHECK_BDB_DIR], [
-dnl ([$bdb])
-dnl echo ["MYSQL_CHECK_BDB_DIR ($1)"]
-  dir="$1"
-
-  MYSQL_CHECK_INSTALLED_BDB([$dir/include], [$dir/lib])
-
-  if test X"$bdb_dir_ok" != Xinstalled; then
-    # test to see if it's a source dir
-    rel="$dir/dist/RELEASE"
-    if test -f "$rel"; then
-      MYSQL_CHECK_BDB_VERSION([$rel], [], [=])
-      if test X"$bdb_version_ok" = Xyes; then
-        bdb_dir_ok=source
-        bdb="$dir"
-        MYSQL_TOP_BUILDDIR([dir])
-        bdb_includes="-I$dir/build_unix"
-        bdb_libs="-L$dir/build_unix -ldb"
-	bdb_libs_with_path="$dir/build_unix/libdb.a"
-      else
-        bdb_dir_ok="$bdb_version_ok"
-      fi
-    else
-      bdb_dir_ok="'$dir' doesn't look like a BDB directory ($bdb_dir_ok)"
-    fi
-  fi
-])
-
-AC_DEFUN([MYSQL_SEARCH_FOR_BDB], [
-dnl echo ["MYSQL_SEARCH_FOR_BDB"]
-  bdb_dir_ok="no BerkeleyDB found"
-
-  for test_dir in $srcdir/storage/bdb $srcdir/db-*.*.* /usr/local/BerkeleyDB*; do
-dnl    echo "-----------> Looking at ($test_dir; `cd $test_dir && pwd`)"
-    MYSQL_CHECK_BDB_DIR([$test_dir])
-    if test X"$bdb_dir_ok" = Xsource || test X"$bdb_dir_ok" = Xinstalled; then
-dnl	echo "-----------> Found it ($bdb), ($srcdir)"
-dnl     This is needed so that 'make distcheck' works properly (VPATH build).
-dnl     VPATH build won't work if bdb is not under the source tree; but in
-dnl     that case, hopefully people will just make and install inside the
-dnl     tree, or install BDB first, and then use the installed version.
-	case "$bdb" in
-	"$srcdir/"* ) bdb=`echo "$bdb" | sed -e "s,^$srcdir/,,"` ;;
-	esac
-        break
-    fi
-  done
-])
-
-dnl MYSQL_CHECK_BDB_VERSION takes 3 arguments:
-dnl     1)  the file to look in
-dnl     2)  the search pattern before DB_VERSION_XXX
-dnl     3)  the search pattern between DB_VERSION_XXX and the number
-dnl It assumes that the number is the last thing on the line
-AC_DEFUN([MYSQL_CHECK_BDB_VERSION], [
-  db_major=`sed -e '/^[$2]DB_VERSION_MAJOR[$3]/ !d' -e 's///' [$1]`
-  db_minor=`sed -e '/^[$2]DB_VERSION_MINOR[$3]/ !d' -e 's///' [$1]`
-  db_patch=`sed -e '/^[$2]DB_VERSION_PATCH[$3]/ !d' -e 's///' [$1]`
-  test -z "$db_major" && db_major=0
-  test -z "$db_minor" && db_minor=0
-  test -z "$db_patch" && db_patch=0
-
-dnl   # This is ugly, but about as good as it can get
-dnl #  mysql_bdb=
-dnl #  if test $db_major -eq 3 && test $db_minor -eq 2 && test $db_patch -eq 3
-dnl #  then
-dnl #    mysql_bdb=h
-dnl #  elif test $db_major -eq 3 && test $db_minor -eq 2 && test $db_patch -eq 9
-dnl #  then
-dnl #    want_bdb_version="3.2.9a"	# hopefully this will stay up-to-date
-dnl #    mysql_bdb=a
-dnl #  fi
-
-dnl RAM:
-want_bdb_version="4.1.24"
-bdb_version_ok=yes
-
-dnl #  if test -n "$mysql_bdb" && \
-dnl #	grep "DB_VERSION_STRING.*:.*$mysql_bdb: " [$1] > /dev/null
-dnl #  then
-dnl #    bdb_version_ok=yes
-dnl #  else
-dnl #    bdb_version_ok="invalid version $db_major.$db_minor.$db_patch"
-dnl #    bdb_version_ok="$bdb_version_ok (must be version 3.2.3h or $want_bdb_version)"
-dnl #  fi
-])
-
-AC_DEFUN([MYSQL_TOP_BUILDDIR], [
-  case "$[$1]" in
-    /* ) ;;		# don't do anything with an absolute path
-    "$srcdir"/* )
-      # If BDB is under the source directory, we need to look under the
-      # build directory for bdb/build_unix.
-      # NOTE: I'm being lazy, and assuming the user did not specify
-      # something like --with-berkeley-db=bdb (it would be missing "./").
-      [$1]="\$(top_builddir)/"`echo "$[$1]" | sed -e "s,^$srcdir/,,"`
-      ;;
-    * )
-      AC_MSG_ERROR([The BDB directory must be directly under the MySQL source directory, or be specified using the full path. ('$srcdir'; '$[$1]')])
-      ;;
-  esac
-  if test X"$[$1]" != "/"
-  then
-    [$1]=`echo $[$1] | sed -e 's,/$,,'`
-  fi
-])
-
-dnl ---------------------------------------------------------------------------
-dnl END OF MYSQL_CHECK_BDB SECTION
-dnl ---------------------------------------------------------------------------

libmysqld/lib_sql.cc

@@ -524,11 +524,7 @@ int init_embedded_server(int argc, char **argv, char **groups)
 
   (void) thr_setconcurrency(concurrency);	// 10 by default
 
-  if (
+  if (flush_time && flush_time != ~(ulong) 0L)
-#ifdef HAVE_BERKELEY_DB
-      (have_berkeley_db == SHOW_OPTION_YES) ||
-#endif
-      (flush_time && flush_time != ~(ulong) 0L))
   {
     pthread_t hThread;
     if (pthread_create(&hThread,&connection_attrib,handle_manager,0))

mysql-test/mysql-test-run.pl

@@ -1299,8 +1299,10 @@ sub executable_setup () {
     $path_ndb_tools_dir=  "$glob_basedir/bin";
     $exe_ndb_mgm=         "$glob_basedir/bin/ndb_mgm";
     $exe_ndb_waiter=      "$glob_basedir/bin/ndb_waiter";
-    $exe_ndbd=            "$glob_basedir/libexec/ndbd";
+    $exe_ndbd=            mtr_exe_exists("$glob_basedir/libexec/ndbd",
-    $exe_ndb_mgmd=        "$glob_basedir/libexec/ndb_mgmd";
+                                         "$glob_basedir/bin/ndbd");
+    $exe_ndb_mgmd=        mtr_exe_exists("$glob_basedir/libexec/ndb_mgmd",
+                                         "$glob_basedir/bin/ndb_mgmd");
   }
 
   $exe_master_mysqld= $exe_master_mysqld || $exe_mysqld;

sql/mysql_priv.h

@@ -1378,8 +1378,6 @@ bool mysql_load(THD *thd, sql_exchange *ex, TABLE_LIST *table_list,
 int write_record(THD *thd, TABLE *table, COPY_INFO *info);
 
 /* sql_manager.cc */
-/* bits set in manager_status */
-#define MANAGER_BERKELEY_LOG_CLEANUP    (1L << 0)
 extern ulong volatile manager_status;
 extern bool volatile manager_thread_in_use, mqh_used;
 extern pthread_t manager_thread;

sql/set_var.cc

@@ -487,7 +487,7 @@ sys_var_const_str	sys_version_compile_os("version_compile_os",
                                                SYSTEM_TYPE);
 sys_var_thd_ulong	sys_net_wait_timeout("wait_timeout",
 					     &SV::net_wait_timeout);
-
+#ifdef WITH_INNOBASE_STORAGE_ENGINE
 sys_var_long_ptr	sys_innodb_fast_shutdown("innodb_fast_shutdown",
 						 &innobase_fast_shutdown);
 sys_var_long_ptr        sys_innodb_max_dirty_pages_pct("innodb_max_dirty_pages_pct",
@@ -513,7 +513,7 @@ sys_var_long_ptr  sys_innodb_commit_concurrency("innodb_commit_concurrency",
 sys_var_long_ptr  sys_innodb_flush_log_at_trx_commit(
                                         "innodb_flush_log_at_trx_commit",
                                         &srv_flush_log_at_trx_commit);
-
+#endif
 /* Condition pushdown to storage engine */
 sys_var_thd_bool
 sys_engine_condition_pushdown("engine_condition_pushdown",
@@ -816,6 +816,7 @@ SHOW_VAR init_vars[]= {
   {"init_connect",            (char*) &sys_init_connect,            SHOW_SYS},
   {"init_file",               (char*) &opt_init_file,               SHOW_CHAR_PTR},
   {"init_slave",              (char*) &sys_init_slave,              SHOW_SYS},
+#ifdef WITH_INNOBASE_STORAGE_ENGINE
   {"innodb_additional_mem_pool_size", (char*) &innobase_additional_mem_pool_size, SHOW_LONG },
   {sys_innodb_autoextend_increment.name, (char*) &sys_innodb_autoextend_increment, SHOW_SYS},
   {"innodb_buffer_pool_awe_mem_mb", (char*) &innobase_buffer_pool_awe_mem_mb, SHOW_LONG },
@@ -849,6 +850,7 @@ SHOW_VAR init_vars[]= {
   {sys_innodb_thread_concurrency.name, (char*) &sys_innodb_thread_concurrency, SHOW_SYS},
   {sys_innodb_thread_sleep_delay.name, (char*) &sys_innodb_thread_sleep_delay, SHOW_SYS},
   {sys_innodb_flush_log_at_trx_commit.name, (char*) &sys_innodb_flush_log_at_trx_commit, SHOW_SYS},
+#endif
   {sys_interactive_timeout.name,(char*) &sys_interactive_timeout,   SHOW_SYS},
   {sys_join_buffer_size.name,   (char*) &sys_join_buffer_size,	    SHOW_SYS},
   {sys_key_buffer_size.name,	(char*) &sys_key_buffer_size,	    SHOW_SYS},

storage/ndb/config/win-prg.am

@@ -71,7 +71,7 @@ LINK32=xilink6.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "NDB_WIN32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /D "NDB_WIN32" /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /D "NDB_WIN32" /I "../include" /I "../regex" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c
 # ADD BASE CPP @includes@
 # ADD CPP @includes@
 # SUBTRACT CPP /Fr /YX

storage/ndb/test/run-test/ndb-autotest.sh

@@ -168,10 +168,8 @@ then
 	    if [ -d storage ]
 	    then
 		(cd storage/innobase; aclocal; autoheader; autoconf; automake)
-		(cd storage/bdb/dist; sh s_all)
 	    else
 		(cd innobase; aclocal; autoheader; autoconf; automake)
-		(cd bdb/dist; sh s_all)
 	    fi
 	fi
 	eval $configure --prefix=$install_dir

support-files/my-huge.cnf.sh

@@ -114,10 +114,6 @@ server-id	= 1
 #tmpdir		= /tmp/		
 #log-update 	= /path-to-dedicated-directory/hostname
 
-# Uncomment the following if you are using BDB tables
-#bdb_cache_size = 384M
-#bdb_max_lock = 100000
-
 # Uncomment the following if you are using InnoDB tables
 #innodb_data_home_dir = @localstatedir@/
 #innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend

support-files/my-large.cnf.sh

@@ -114,10 +114,6 @@ server-id	= 1
 #tmpdir		= /tmp/		
 #log-update 	= /path-to-dedicated-directory/hostname
 
-# Uncomment the following if you are using BDB tables
-#bdb_cache_size = 256M
-#bdb_max_lock = 100000
-
 # Uncomment the following if you are using InnoDB tables
 #innodb_data_home_dir = @localstatedir@/
 #innodb_data_file_path = ibdata1:10M:autoextend

support-files/my-medium.cnf.sh

@@ -112,10 +112,6 @@ server-id	= 1
 #tmpdir		= /tmp/		
 #log-update 	= /path-to-dedicated-directory/hostname
 
-# Uncomment the following if you are using BDB tables
-#bdb_cache_size = 16M
-#bdb_max_lock = 10000
-
 # Uncomment the following if you are using InnoDB tables
 #innodb_data_home_dir = @localstatedir@/
 #innodb_data_file_path = ibdata1:10M:autoextend