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
1.1945 05/10/29 04:26:35 kent@stripped +4 -0
Makefile.in:
Added bdb sequence directory to "make dist"
Makefile.am:
List ha_*.h for handlers in storage dir
complete.c:
Avoid FreeBSD 5.3 problems including file.h
Makefile.am:
Restored all engines to DIST_SUBDIRS
storage/bdb/Makefile.in
1.8 05/10/29 04:21:57 kent@stripped +1 -2
Added bdb sequence directory to "make dist"
sql/Makefile.am
1.119 05/10/29 03:47:46 kent@stripped +6 -3
List ha_*.h for handlers in storage dir
cmd-line-utils/readline/complete.c
1.18 05/10/29 02:46:50 kent@stripped +2 -1
Avoid FreeBSD 5.3 problems including file.h
storage/Makefile.am
1.4 05/10/29 02:46:00 kent@stripped +2 -2
Restored all engines to DIST_SUBDIRS
# 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: c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root: /Users/kent/mysql/bk/mysql-5.1
--- 1.17/cmd-line-utils/readline/complete.c 2005-10-12 17:17:52 +02:00
+++ 1.18/cmd-line-utils/readline/complete.c 2005-10-29 02:46:50 +02:00
@@ -33,7 +33,8 @@
#include <fcntl.h>
-#if defined (HAVE_SYS_FILE_H)
+/* FreeBSD 5.3 will not declare u_int in sys/types.h, file.h needs it */
+#if defined (HAVE_SYS_FILE_H) && !defined(__FreeBSD__)
# include <sys/file.h>
#endif
--- 1.118/sql/Makefile.am 2005-10-22 00:59:13 +02:00
+++ 1.119/sql/Makefile.am 2005-10-29 03:47:46 +02:00
@@ -49,7 +49,7 @@
procedure.h sql_class.h sql_lex.h sql_list.h \
sql_manager.h sql_map.h sql_string.h unireg.h \
sql_error.h field.h handler.h mysqld_suffix.h \
- ha_heap.h ha_myisam.h ha_myisammrg.h ha_partition.h \
+ ha_heap.h ha_myisam.h ha_myisammrg.h \
opt_range.h protocol.h \
sql_select.h structs.h table.h sql_udf.h hash_filo.h\
lex.h lex_symbol.h sql_plugin.h sql_acl.h sql_crypt.h \
@@ -94,9 +94,12 @@
sp_cache.cc parse_file.cc sql_trigger.cc \
handlerton.cc
EXTRA_mysqld_SOURCES = ha_innodb.cc ha_berkeley.cc ha_archive.cc \
+ ha_innodb.h ha_berkeley.h ha_archive.h \
ha_blackhole.cc ha_federated.cc ha_ndbcluster.cc \
- ha_partition.cc \
- examples/ha_tina.cc examples/ha_example.cc
+ ha_blackhole.h ha_federated.h ha_ndbcluster.h \
+ ha_partition.cc ha_partition.h \
+ examples/ha_tina.cc examples/ha_example.cc \
+ examples/ha_tina.h examples/ha_example.h
mysqld_DEPENDENCIES = @mysql_se_objs@
gen_lex_hash_SOURCES = gen_lex_hash.cc
gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
--- 1.3/storage/Makefile.am 2005-10-20 03:51:16 +02:00
+++ 1.4/storage/Makefile.am 2005-10-29 02:46:00 +02:00
@@ -21,7 +21,7 @@
# These are built from source in the Docs directory
EXTRA_DIST =
SUBDIRS =
-DIST_SUBDIRS = . heap myisam myisammrg
-
+DIST_SUBDIRS = . bdb heap innobase myisam myisammrg ndb
+
# Don't update the files from bitkeeper
%::SCCS/s.%
--- 1.7/storage/bdb/Makefile.in 2005-04-08 04:25:38 +02:00
+++ 1.8/storage/bdb/Makefile.in 2005-10-29 04:21:57 +02:00
@@ -30,7 +30,7 @@
db_verify dbm dbreg dist env examples_c examples_cxx fileops hash \
hsearch hmac include java libdb_java lock log mp mutex os os_vxworks \
os_win32 perl.BerkeleyDB perl.DB_File qam rep rpc_client rpc_server tcl \
- test txn xa
+ test txn xa sequence
@SET_MAKE@
@@ -54,4 +54,3 @@
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)
| Thread |
|---|
| • bk commit into 5.1 tree (kent:1.1945) | kent | 29 Oct |
