Below is the list of changes that have just been committed into a local
4.0 repository of jww. When jww 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://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet
1.1645 03/12/06 01:21:41 jww@stripped +12 -0
Merge
support-files/mysql.server.sh
1.35 03/12/05 23:52:14 jww@stripped +1 -2
Merge, keep move of set pid file if not given.
scripts/make_binary_distribution.sh
1.58 03/12/05 23:48:10 jww@stripped +1 -2
Merge, remove COPYING.LIB, keep move of INSTALL-BINARY
Docs/Makefile.am
1.52 03/12/05 23:45:00 jww@stripped +0 -1
Merge remove COPYING.LIB
Makefile.am
1.55 03/12/05 23:41:45 jww@stripped +1 -2
Merge, remove COPYING.LIB, keep INSTALL-BINARY
sql/mysqld.cc
1.459 03/12/05 21:23:25 jww@stripped +0 -0
Auto merged
scripts/Makefile.am
1.30 03/12/05 21:23:09 jww@stripped +0 -0
Auto merged
mysys/Makefile.am
1.46 03/12/05 21:23:08 jww@stripped +0 -0
Auto merged
libmysqld/Makefile.am
1.25 03/12/05 21:23:08 jww@stripped +0 -0
Auto merged
libmysql_r/Makefile.am
1.12 03/12/05 21:23:07 jww@stripped +0 -0
Auto merged
configure.in
1.289 03/12/05 21:23:05 jww@stripped +0 -0
Auto merged
BitKeeper/etc/logging_ok
1.285 03/12/05 21:05:13 jww@stripped +0 -0
auto-union
BitKeeper/etc/ignore
1.151 03/12/05 21:05:09 jww@stripped +1 -1
auto-union
# 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: jww
# Host: skymaster.silksystems.com
# Root: /u/src/mysql/mysql-4.0/RESYNC
--- 1.51/Docs/Makefile.am Sat Sep 13 01:00:36 2003
+++ 1.52/Docs/Makefile.am Fri Dec 5 23:45:00 2003
@@ -27,7 +27,7 @@
all: $(targets) txt_files
-txt_files: ../INSTALL-SOURCE ../COPYING ../COPYING.LIB \
+txt_files: ../INSTALL-SOURCE ../COPYING \
../INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
CLEAN_FILES: $(build_sources)
@@ -230,10 +230,6 @@
../COPYING: mysql.info $(GT)
if test ! -f mysql.info; then d="$(srcdir)/"; else d=;fi;\
$(PERL) -w $(GT) $${d}mysql.info "GPL license" "LGPL license" > $@
-
-../COPYING.LIB: mysql.info $(GT)
- if test ! -f mysql.info; then d="$(srcdir)/"; else d=;fi;\
- $(PERL) -w $(GT) $${d}mysql.info "LGPL license" "Function Index" > $@
../support-files/MacOSX/ReadMe.txt: mysql.info $(GT)
if test ! -f mysql.info; then d="$(srcdir)/"; else d=;fi;\
--- 1.54/Makefile.am Wed Jun 25 21:52:48 2003
+++ 1.55/Makefile.am Fri Dec 5 23:41:45 2003
@@ -19,8 +19,7 @@
AUTOMAKE_OPTIONS = foreign
# These are built from source in the Docs directory
-BUILT_SOURCES = INSTALL-SOURCE README \
- COPYING COPYING.LIB INSTALL-BINARY
+EXTRA_DIST = INSTALL-SOURCE README COPYING INSTALL-BINARY
SUBDIRS = . include @docs_dirs@ @readline_dir@ \
@thread_dirs@ pstack @sql_client_dirs@ \
@sql_server_dirs@ scripts man tests \
--- 1.288/configure.in Thu Oct 23 13:35:06 2003
+++ 1.289/configure.in Fri Dec 5 21:23:05 2003
@@ -1857,7 +1857,7 @@
pthread_attr_create pthread_getsequence_np pthread_attr_setstacksize \
pthread_attr_getstacksize \
pthread_condattr_create rwlock_init pthread_rwlock_rdlock \
- fchmod getpass getpassphrase initgroups mlockall)
+ fsync fdatasync fchmod getpass getpassphrase initgroups mlockall)
CFLAGS="$ORG_CFLAGS"
--- 1.45/mysys/Makefile.am Fri May 9 13:40:37 2003
+++ 1.46/mysys/Makefile.am Fri Dec 5 21:23:08 2003
@@ -47,7 +47,7 @@
my_delete.c my_rename.c my_redel.c my_tempnam.c \
my_chsize.c my_lread.c my_lwrite.c my_clock.c \
my_quick.c my_lockmem.c my_static.c \
- my_getopt.c my_mkdir.c \
+ my_sync.c my_getopt.c my_mkdir.c \
default.c my_compress.c checksum.c raid.cc \
my_net.c my_semaphore.c my_port.c my_sleep.c \
my_vsnprintf.c charset.c my_bitmap.c my_bit.c md5.c \
--- 1.29/scripts/Makefile.am Fri Oct 24 10:19:06 2003
+++ 1.30/scripts/Makefile.am Fri Dec 5 21:23:09 2003
@@ -143,6 +143,7 @@
-e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
-e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \
-e 's!@''LIBS''@!@LIBS@!' \
+ -e 's!@''WRAPLIBS''@!@WRAPLIBS@!' \
-e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \
-e 's!@''openssl_libs''@!@openssl_libs@!' \
-e 's!@''VERSION''@!@VERSION@!' \
--- 1.57/scripts/make_binary_distribution.sh Sat Sep 13 02:04:50 2003
+++ 1.58/scripts/make_binary_distribution.sh Fri Dec 5 23:48:10 2003
@@ -108,7 +108,7 @@
fi
done
-for i in COPYING COPYING.LIB README INSTALL-BINARY \
+for i in COPYING README INSTALL-BINARY \
MySQLEULA.txt LICENSE.doc README.NW
do
if [ -f $i ]
--- 1.458/sql/mysqld.cc Sun Oct 26 21:41:05 2003
+++ 1.459/sql/mysqld.cc Fri Dec 5 21:23:25 2003
@@ -1958,7 +1958,7 @@
#endif
-const char *load_default_groups[]= { "mysqld","server",MYSQL_BASE_VERSION,0 };
+const char *load_default_groups[]= { "mysqld","server",MYSQL_BASE_VERSION,0,0};
bool open_log(MYSQL_LOG *log, const char *hostname,
const char *opt_name, const char *extension,
@@ -2561,7 +2561,7 @@
const char *extra_opt)
{
char path_and_service[FN_REFLEN+FN_REFLEN+32], *pos, *end;
- end= path_and_service + sizeof(path_and_service)-1;
+ end= path_and_service + sizeof(path_and_service)-3;
/* We have to quote filename if it contains spaces */
pos= add_quoted_string(path_and_service, file_path, end);
@@ -2571,7 +2571,9 @@
*pos++= ' ';
pos= add_quoted_string(pos, extra_opt, end);
}
- *pos= 0; // Ensure end null
+ /* We must have servicename last */
+ *pos++= ' ';
+ (void) add_quoted_string(pos, servicename, end);
if (Service.got_service_option(argv, "install"))
{
@@ -2613,10 +2615,16 @@
if (!default_service_handling(argv, MYSQL_SERVICENAME, MYSQL_SERVICENAME,
file_path, ""))
return 0;
- if (Service.IsService(argv[1]))
+ if (Service.IsService(argv[1])) /* Start an optional service */
{
- /* start an optional service */
- load_default_groups[0]= argv[1];
+ /*
+ Only add the service name to the groups read from the config file
+ if it's not "MySQL". (The default service name should be 'mysqld'
+ but we started a bad tradition by calling it MySQL from the start
+ and we are now stuck with it.
+ */
+ if (my_strcasecmp(argv[1],"mysql"))
+ load_default_groups[3]= argv[1];
start_mode= 1;
Service.Init(argv[1], mysql_service);
return 0;
@@ -2624,8 +2632,7 @@
}
else if (argc == 3) /* install or remove any optional service */
{
- if (!default_service_handling(argv, argv[2], argv[2], file_path,
- argv[2]))
+ if (!default_service_handling(argv, argv[2], argv[2], file_path, ""))
return 0;
if (Service.IsService(argv[2]))
{
@@ -2637,6 +2644,8 @@
opt_argc= 2; // Skip service-name
opt_argv=argv;
start_mode= 1;
+ if (my_strcasecmp(argv[2],"mysql"))
+ load_default_groups[3]= argv[2];
Service.Init(argv[2], mysql_service);
return 0;
}
@@ -4269,8 +4278,8 @@
static void print_version(void)
{
- printf("%s Ver %s for %s on %s\n",my_progname,
- server_version,SYSTEM_TYPE,MACHINE_TYPE);
+ printf("%s Ver %s for %s on %s (%s)\n",my_progname,
+ server_version,SYSTEM_TYPE,MACHINE_TYPE, MYSQL_COMPILATION_COMMENT);
}
static void use_help(void)
--- 1.34/support-files/mysql.server.sh Sat Oct 25 00:14:25 2003
+++ 1.35/support-files/mysql.server.sh Fri Dec 5 23:52:14 2003
@@ -109,19 +109,6 @@
fi
#
-# Set pid file if not given
-#
-if test -z "$pid_file"
-then
- pid_file=$datadir/@PROGRAM_PREFIX@`@HOSTNAME@`@PROGRAM_SUFFIX@.pid
-else
- case "$pid_file" in
- /* ) ;;
- * ) pid_file="$datadir/$pid_file" ;;
- esac
-fi
-
-#
# Test if someone changed datadir; In this case we should also read the
# default arguments from this directory
#
@@ -133,6 +120,19 @@
fi
parse_arguments `$print_defaults $extra_args mysqld mysql_server mysql.server`
+
+#
+# Set pid file if not given
+#
+if test -z "$pid_file"
+then
+ pid_file=$datadir/@PROGRAM_PREFIX@`@HOSTNAME@`@PROGRAM_SUFFIX@.pid
+else
+ case "$pid_file" in
+ /* ) ;;
+ * ) pid_file="$datadir/$pid_file" ;;
+ esac
+fi
# Safeguard (relative paths, core dumps..)
cd $basedir
--- 1.284/BitKeeper/etc/logging_ok Thu Oct 23 12:31:47 2003
+++ 1.285/BitKeeper/etc/logging_ok Fri Dec 5 21:05:13 2003
@@ -51,6 +51,7 @@
jww@stripped
jww@stripped
kaj@stripped
+konstantin@stripped
kostja@stripped
lenz@stripped
lenz@stripped
@@ -68,6 +69,7 @@
monty@mashka.(none)
monty@stripped
monty@stripped
+monty@stripped
monty@narttu.
monty@stripped
monty@rescue.
@@ -97,12 +99,14 @@
root@stripped
salle@geopard.(none)
salle@stripped
+salle@stripped
sasha@stripped
serg@stripped
serg@stripped
serg@stripped
serg@stripped
serg@stripped
+sergefp@stripped
sinisa@stripped
tfr@stripped
tfr@stripped
--- 1.24/libmysqld/Makefile.am Fri May 23 10:29:31 2003
+++ 1.25/libmysqld/Makefile.am Fri Dec 5 21:23:08 2003
@@ -89,10 +89,10 @@
ar x $$file; \
for obj in *.o ; do mv $$obj $${bfile}_$$obj ; done ; \
ar q ../libmysqld_int2.a *.o ; \
- rm *.o ; \
+ rm -f *.o ; \
done
mv libmysqld_int2.a libmysqld.a
- rm tmp/*
+ rm -f tmp/*
$(RANLIB) libmysqld.a
## XXX: any time the client interface changes, we'll need to bump
--- 1.150/BitKeeper/etc/ignore Thu Oct 23 12:31:33 2003
+++ 1.151/BitKeeper/etc/ignore Fri Dec 5 21:05:09 2003
@@ -507,6 +507,7 @@
sql/sql_select.cc.orig
sql/sql_yacc.cc
sql/sql_yacc.h
+sql/udf_example.so
stamp-h
stamp-h.in
stamp-h1
--- 1.11/libmysql_r/Makefile.am Fri May 9 13:18:08 2003
+++ 1.12/libmysql_r/Makefile.am Fri Dec 5 21:23:07 2003
@@ -19,7 +19,7 @@
target = libmysqlclient_r.la
target_defs = -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
-## LIBS = @LIBS@
+LIBS = @LIBS@ @openssl_libs@
INCLUDES = @MT_INCLUDES@ -I../include -I$(srcdir)/../include \
-I$(srcdir)/.. -I$(top_srcdir) -I.. $(openssl_includes)
| Thread |
|---|
| • bk commit into 4.0 tree (jww:1.1645) | jwythe | 6 Dec |
