Below is the list of changes that have just been committed into a local
5.1 repository of tsmith. When tsmith 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-09-13 19:51:43+02:00, tsmith@stripped +4 -0
Post-merge fixes
client/Makefile.am@stripped, 2006-09-13 19:48:59+02:00, tsmith@stripped +0 -2
Post-merge fix
server-tools/instance-manager/Makefile.am@stripped, 2006-09-13 19:47:10+02:00, tsmith@stripped +1 -2
Post-merge fix
sql/log.h@stripped, 2006-09-13 19:47:10+02:00, tsmith@stripped +1 -1
Post-merge fix
storage/innobase/Makefile.am@stripped, 2006-09-13 19:47:10+02:00, tsmith@stripped +0 -1
Post-merge fix
# 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: tsmith
# Host: maint1.mysql.com
# Root: /data/localhome/tsmith/bk/50-51/51
--- 1.75/client/Makefile.am 2006-09-13 19:50:09 +02:00
+++ 1.76/client/Makefile.am 2006-09-13 19:50:09 +02:00
@@ -79,8 +79,6 @@ DEFS = -DUNDEF_THREADS_HACK \
-DDATADIR="\"$(localstatedir)\""
EXTRA_DIST = get_password.c CMakeLists.txt
-EXTRA_DIST = get_password.c CMakeLists.txt
-
link_sources:
for f in $(sql_src) ; do \
rm -f $$f; \
--- 1.39/server-tools/instance-manager/Makefile.am 2006-09-13 19:50:10 +02:00
+++ 1.40/server-tools/instance-manager/Makefile.am 2006-09-13 19:50:10 +02:00
@@ -18,8 +18,7 @@ INCLUDES= @ZLIB_INCLUDES@ -I$(top_srcdir
@openssl_includes@ -I$(top_builddir)/include
DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER
-EXTRA_DIST = IMService.cpp IMService.h WindowsService.cpp WindowsService.h \
- CMakeLists.txt
+
# As all autoconf variables depend from ${prefix} and being resolved only when
# make is run, we can not put these defines to a header file (e.g. to
# default_options.h, generated from default_options.h.in)
--- 1.14/sql/log.h 2006-09-13 19:50:10 +02:00
+++ 1.15/sql/log.h 2006-09-13 19:50:10 +02:00
@@ -177,7 +177,7 @@ public:
pthread_mutex_t LOCK_log;
char *name;
char log_file_name[FN_REFLEN];
- char time_buff[20], db[NAME_LEN + 1];
+ char time_buff[20], db[NAME_BYTE_LEN + 1];
bool write_error, inited;
IO_CACHE log_file;
enum_log_type log_type;
--- 1.21/storage/innobase/Makefile.am 2006-09-13 19:50:10 +02:00
+++ 1.22/storage/innobase/Makefile.am 2006-09-13 19:50:10 +02:00
@@ -36,7 +36,6 @@ SUBDIRS = os ut btr buf data dict dyn e
ha ibuf lock log mach mem mtr page \
handler \
pars que read rem row srv sync thr trx usr
-EXTRA_DIST = CMakeLists.txt
EXTRA_DIST = include/btr0btr.h include/btr0btr.ic include/btr0cur.h include/btr0cur.ic \
include/btr0pcur.h include/btr0pcur.ic include/btr0sea.h include/btr0sea.ic \
| Thread |
|---|
| • bk commit into 5.1 tree (tsmith:1.2315) | tim | 13 Sep |
