diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-15 17:19:12 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-15 17:19:12 +0200 |
| commit | 1f23f87f06e10ba616b7ae96757cdd8f0d0cc07b (patch) | |
| tree | 3a7b8f403ef4e10a9181f9c092f9e98ccd0e5eb9 | |
| parent | 4d37689abeeaacb662c31d58038d2386a5228f8f (diff) | |
| parent | 22f568dc0d8e27442b1c0b2c5a0b6bf35c88401c (diff) | |
| download | mariadb-git-1f23f87f06e10ba616b7ae96757cdd8f0d0cc07b.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
| -rw-r--r-- | BitKeeper/etc/logging_ok | 4 | ||||
| -rwxr-xr-x | BitKeeper/triggers/post-commit | 2 | ||||
| -rw-r--r-- | Docs/manual.texi | 13 | ||||
| -rw-r--r-- | sql/share/Makefile.am | 11 |
4 files changed, 25 insertions, 5 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 1c8b711ba8e..a5eeb78ba88 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,4 +1,8 @@ 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 diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit index cfa362bcbbd..2a69d50d397 100755 --- a/BitKeeper/triggers/post-commit +++ b/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" diff --git a/Docs/manual.texi b/Docs/manual.texi index 6e698ada56a..04bef2723fa 100644 --- a/Docs/manual.texi +++ b/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) @@ -4179,6 +4185,11 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}. @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] @ @uref{http://mysql.directnet.ru/, WWW} @@ -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. diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am index afdcdd8f81c..e662c4f09a2 100644 --- a/sql/share/Makefile.am +++ b/sql/share/Makefile.am @@ -1,15 +1,16 @@ ## 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@; \ |