bk commit into 3.23 tree (1.1419)

[jwythe]

Below is the list of changes that have just been committed into a local
3.23 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.1419 05/04/16 11:17:57 jww@stripped +2 -0
  Merge

  Docs/Makefile.am
    1.40 05/04/16 11:17:38 jww@stripped +1 -2
    Manual merge completion.

  BitKeeper/etc/logging_ok
    1.254 05/04/16 03:33:13 jww@stripped +0 -0
    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:	lnxdev.silk.ca
# Root:	/usr/src/mysql/mysql-3.23/RESYNC

--- 1.39/Docs/Makefile.am	2003-12-06 06:38:34 -08:00
+++ 1.40/Docs/Makefile.am	2005-04-16 11:17:38 -07:00
@@ -155,7 +155,7 @@
 
 ../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" > $@
+	$(PERL) -w $(GT) $${d}mysql.info "GPL license" "MySQL FOSS License Exception" > $@
 
 uninstall-info:
 	$(PRE_UNINSTALL)

--- 1.253/BitKeeper/etc/logging_ok	2004-02-16 00:18:27 -08:00
+++ 1.254/BitKeeper/etc/logging_ok	2005-04-16 03:33:13 -07:00
@@ -11,6 +11,7 @@
 guilhem@stripped
 heikki@stripped
 heikki@stripped
+ingo@stripped
 jani@stripped
 jorge@stripped
 jww@stripped
@@ -28,6 +29,7 @@
 monty@stripped
 monty@stripped
 monty@stripped
+monty@stripped
 monty@narttu.
 monty@stripped
 monty@tik.
@@ -37,6 +39,8 @@
 nick@stripped
 nick@stripped
 paul@stripped
+paul@stripped
+paul@stripped
 paul@stripped
 salle@geopard.(none)
 salle@stripped