bk commit into 4.0 tree (gbichot:1.2097)

[guilhem]

Below is the list of changes that have just been committed into a local
4.0 repository of gbichot. When gbichot 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.2097 05/05/07 11:35:14 gbichot@stripped +3 -0
  [backport of 4.1, because 4.0 autobuild now hits the same problem;
  when merging just use "ul"] In configure.in, don't remove
$AVAILABLE_LANGUAGES_ERRORS_RULES at end
  because config.status may later need this file (if it does not find it
  it won't incorporate dependencies of errmsg.sys in sql/share/Makefile).
  In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile.

  BitKeeper/etc/logging_ok
    1.334 05/05/07 11:35:14 gbichot@stripped +1 -0
    Logging to logging@stripped accepted

  sql/share/Makefile.am
    1.22 05/05/07 11:30:19 gbichot@stripped +1 -1
    using "all:" leads to double-"all:" in Makefile (counting the auto-generated);
    all-local is the standard way to :

  configure.in
    1.326 05/05/07 11:29:23 gbichot@stripped +0 -1
    Don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end of configure.in
    because config.status may later need this file (if it does not find it
    it won't incorporate dependencies of errmsg.sys in sql/share/Makefile :( )

# 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:	gbichot
# Host:	production.mysql.com
# Root:	/nfstmp1/guilhem/mysql-4.0-prod

--- 1.325/configure.in	2005-04-29 17:26:33 +02:00
+++ 1.326/configure.in	2005-05-07 11:29:23 +02:00
@@ -2720,7 +2720,6 @@
   test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
  ])
 
-rm -f $AVAILABLE_LANGUAGES_ERRORS_RULES
 echo
 echo "MySQL has a Web site at http://www.mysql.com/ which carries details on the"
 echo "latest release, upcoming features, and other information to make your"

--- 1.21/sql/share/Makefile.am	2005-04-19 17:00:02 +02:00
+++ 1.22/sql/share/Makefile.am	2005-05-07 11:30:19 +02:00
@@ -25,7 +25,7 @@
 	$(INSTALL_DATA) $(srcdir)/charsets/README $(distdir)/charsets
 	$(INSTALL_DATA) $(srcdir)/charsets/Index $(distdir)/charsets
 
-all: @AVAILABLE_LANGUAGES_ERRORS@
+all-local: @AVAILABLE_LANGUAGES_ERRORS@
 
 # this is ugly, but portable
 @AVAILABLE_LANGUAGES_ERRORS_RULES@

--- 1.333/BitKeeper/etc/logging_ok	2005-05-06 15:42:27 +02:00
+++ 1.334/BitKeeper/etc/logging_ok	2005-05-07 11:35:14 +02:00
@@ -30,6 +30,7 @@
 dlenev@stripped
 dlenev@stripped
 dlenev@stripped
+gbichot@stripped
 gbichot@stripped
 gerberb@stripped
 gluh@gluh.(none)