Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2006-08-21 15:34:29+02:00, kent@stripped +15 -0
Many files:
Deleted config/ac-macros/ha_berkeley.m4
Removed more referenses to bdb
BUILD/FINISH.sh@stripped, 2006-08-21 15:32:42+02:00, kent@stripped +1 -1
Removed more referenses to bdb
BUILD/compile-alpha-cxx@stripped, 2006-08-21 15:32:42+02:00, kent@stripped +1 -1
Removed more referenses to bdb
BUILD/compile-alpha-debug@stripped, 2006-08-21 15:32:42+02:00, kent@stripped +1 -1
Removed more referenses to bdb
BUILD/compile-dist@stripped, 2006-08-21 15:32:42+02:00, kent@stripped +0 -1
Removed more referenses to bdb
BUILD/compile-ia64-debug-max@stripped, 2006-08-21 15:32:43+02:00, kent@stripped +1 -1
Removed more referenses to bdb
BitKeeper/deleted/.del-ha_berkeley.m4@stripped, 2006-08-21 15:17:58+02:00, kent@stripped +0 -0
Delete: config/ac-macros/ha_berkeley.m4
CMakeLists.txt@stripped, 2006-08-21 15:32:43+02:00, kent@stripped +0 -4
Removed more referenses to bdb
Makefile.am@stripped, 2006-08-21 15:32:43+02:00, kent@stripped +1 -5
Removed more referenses to bdb
libmysqld/lib_sql.cc@stripped, 2006-08-21 15:32:43+02:00, kent@stripped +1 -5
Removed more referenses to bdb
sql/mysql_priv.h@stripped, 2006-08-21 15:32:44+02:00, kent@stripped +0 -2
Removed more referenses to bdb
storage/ndb/config/win-prg.am@stripped, 2006-08-21 15:32:44+02:00, kent@stripped +1 -1
Removed more referenses to bdb
storage/ndb/test/run-test/ndb-autotest.sh@stripped, 2006-08-21 15:32:44+02:00, kent@stripped +0 -2
Removed more referenses to bdb
support-files/my-huge.cnf.sh@stripped, 2006-08-21 15:32:44+02:00, kent@stripped +0 -4
Removed more referenses to bdb
support-files/my-large.cnf.sh@stripped, 2006-08-21 15:32:45+02:00, kent@stripped +0 -4
Removed more referenses to bdb
support-files/my-medium.cnf.sh@stripped, 2006-08-21 15:32:45+02:00, kent@stripped +0 -4
Removed more referenses to bdb
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: kent
# Host: g4-2.local
# Root: /Users/kent/mysql/bk/mysql-5.1
--- 1.8/BUILD/compile-alpha-debug 2006-08-21 15:34:45 +02:00
+++ 1.9/BUILD/compile-alpha-debug 2006-08-21 15:34:45 +02:00
@@ -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"
--- 1.94/Makefile.am 2006-08-21 15:34:45 +02:00
+++ 1.95/Makefile.am 2006-08-21 15:34:45 +02:00
@@ -39,11 +39,7 @@
@linked_libmysqld_targets@ \
linked_include_sources @linked_netware_sources@
-# The db.h file is a bit special, see note in "configure.in".
-# 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
+CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = ac_available_languages_fragment
linked_include_sources:
--- 1.429/sql/mysql_priv.h 2006-08-21 15:34:45 +02:00
+++ 1.430/sql/mysql_priv.h 2006-08-21 15:34:45 +02:00
@@ -1378,8 +1378,6 @@
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;
--- 1.24/support-files/my-huge.cnf.sh 2006-08-21 15:34:45 +02:00
+++ 1.25/support-files/my-huge.cnf.sh 2006-08-21 15:34:45 +02:00
@@ -114,10 +114,6 @@
#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
--- 1.24/support-files/my-large.cnf.sh 2006-08-21 15:34:45 +02:00
+++ 1.25/support-files/my-large.cnf.sh 2006-08-21 15:34:45 +02:00
@@ -114,10 +114,6 @@
#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
--- 1.23/support-files/my-medium.cnf.sh 2006-08-21 15:34:45 +02:00
+++ 1.24/support-files/my-medium.cnf.sh 2006-08-21 15:34:45 +02:00
@@ -112,10 +112,6 @@
#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
--- 1.2/storage/ndb/config/win-prg.am 2006-08-21 15:34:45 +02:00
+++ 1.3/storage/ndb/config/win-prg.am 2006-08-21 15:34:45 +02:00
@@ -71,7 +71,7 @@
# 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
--- 1.11/storage/ndb/test/run-test/ndb-autotest.sh 2006-08-21 15:34:45 +02:00
+++ 1.12/storage/ndb/test/run-test/ndb-autotest.sh 2006-08-21 15:34:45 +02:00
@@ -168,10 +168,8 @@
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
--- 1.14/BUILD/compile-dist 2006-08-21 15:34:45 +02:00
+++ 1.15/BUILD/compile-dist 2006-08-21 15:34:45 +02:00
@@ -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)
--- 1.10/BUILD/compile-alpha-cxx 2006-08-21 15:34:46 +02:00
+++ 1.11/BUILD/compile-alpha-cxx 2006-08-21 15:34:46 +02:00
@@ -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"
--- 1.5/BUILD/compile-ia64-debug-max 2006-08-21 15:34:46 +02:00
+++ 1.6/BUILD/compile-ia64-debug-max 2006-08-21 15:34:46 +02:00
@@ -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"
--- 1.119/libmysqld/lib_sql.cc 2006-08-21 15:34:46 +02:00
+++ 1.120/libmysqld/lib_sql.cc 2006-08-21 15:34:46 +02:00
@@ -524,11 +524,7 @@
(void) thr_setconcurrency(concurrency); // 10 by default
- if (
-#ifdef HAVE_BERKELEY_DB
- (have_berkeley_db == SHOW_OPTION_YES) ||
-#endif
- (flush_time && flush_time != ~(ulong) 0L))
+ if (flush_time && flush_time != ~(ulong) 0L)
{
pthread_t hThread;
if (pthread_create(&hThread,&connection_attrib,handle_manager,0))
--- 1.21/CMakeLists.txt 2006-08-21 15:34:46 +02:00
+++ 1.22/CMakeLists.txt 2006-08-21 15:34:46 +02:00
@@ -49,10 +49,6 @@
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)
--- 1.31/BUILD/FINISH.sh 2006-08-21 15:34:46 +02:00
+++ 1.32/BUILD/FINISH.sh 2006-08-21 15:34:46 +02:00
@@ -5,7 +5,7 @@
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\""
| Thread |
|---|
| • bk commit into 5.1 tree (kent:1.2287) | kent | 21 Aug |
