merge

BitKeeper/etc/logging_ok:
  auto-union

BitKeeper/etc/logging_ok

 jani@hynda.mysql.fi
 monty@donna.mysql.com
 mwagner@evoq.home.mwagner.org
+sasha@mysql.sashanet.com
+sasha@work.mysql.com
+serg@hynda.mysql.fi
+tim@cane.mysql.fi
 tim@donna.mysql.com

BitKeeper/triggers/post-commit

@@ -4,6 +4,8 @@
 TO=dev@mysql.com
 FROM=$USER@mysql.com
 
+BK_STATUS=$BK_STATUS$BK_COMMIT
+
 if [ "$BK_STATUS" = OK ]
 then 
  echo "Commit successful, notifying developers at $TO"

Docs/manual.texi

@@ -3974,6 +3974,12 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}.
 @c @uref{http://archive.nat.bg/pub/mirror/mysql/, WWW}
 @c @uref{ftp://ftp.ntrl.net/pub/mirror/mysql/, FTP}
 
+@item
+@c EMAIL: salle@online.bg (Admin)
+@image{Flags/bulgaria} Bulgaria [online.bg/Sofia] @
+@uref{http://mysql.online.bg/, WWW}
+@uref{ftp://mysql.online.bg/, FTP}
+
 @c @item
 @c Added: 990614
 @c Not ok 20000919; Out of date (Matt)
@@ -4178,6 +4184,11 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}.
 @uref{http://ftp.netc.pt/pub/mysql/, WWW}
 @uref{ftp://ftp.netc.pt/pub/mysql/, FTP}
 
+@item
+@c EMAIL: keeper@roedu.net (Mihai RUSU)
+@image{Flags/romania} Romania [roedu.net/Bucharest] @
+@uref{ftp://ftp.roedu.net/pub/mirrors/ftp.mysql.com/, FTP}
+
 @item
 @c EMAIL: kuzmin@dn.ru (Roma Kuzmin)
 @image{Flags/russia} Russia [DirectNet] @
@@ -40379,6 +40390,8 @@ Fixed buffer overflow bug when writing a certain error message.
 Added usage of @code{getrlimit()} on Linux to get @code{-O --open-files-limit=#}
 to work on Linux.
 @item
+Added new mysqld variable: bdb_version.
+@item
 Fixed bug when using expression of type
 @code{SELECT ... FROM t1 left join t2 on (t1.a=t2.a) WHERE t1.a=t2.a}. In this
 case the test in the @code{WHERE} clause was wrongly optimized away.

sql/share/Makefile.am

 ## Process this file with automake to create Makefile.in
 
+ERRMSG=$(patsubst %, %/errmsg.sys, @AVAILABLE_LANGUAGES@)
+
 # This requires gnu cp at distribution time.
 dist-hook:
 	for lang in @AVAILABLE_LANGUAGES@ charsets; \
 	do cp -a $(srcdir)/$$lang $(distdir); done
 
-all:
-	for lang in @AVAILABLE_LANGUAGES@; \
-	do \
-		../../extra/comp_err $(srcdir)/$$lang/errmsg.txt $(srcdir)/$$lang/errmsg.sys; \
-	done
+all: $(ERRMSG)
+
+$(ERRMSG): %.sys: %.txt
+	../../extra/comp_err $< $@
 
 install-data-local:
 	for lang in @AVAILABLE_LANGUAGES@; \