diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-11-16 23:00:18 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-11-16 23:00:18 -0700 |
| commit | 645cfcb142a0a2532a180106308163a613f323ca (patch) | |
| tree | 25147cf317bec2a66e2ce47de3053e915c034590 | |
| parent | 02e6c9634ded99db7fce9844723c3115c0cfc2a4 (diff) | |
| parent | 3d057360572d95252c370901f8bac55fbf137ebe (diff) | |
| download | mariadb-git-645cfcb142a0a2532a180106308163a613f323ca.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
BitKeeper/etc/logging_ok:
auto-union
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | Docs/manual.texi | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index f3ef9f298a8..328eb654350 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,4 +1,5 @@ monty@donna.mysql.com monty@narttu.mysql.fi +mwagner@work.mysql.com sasha@mysql.sashanet.com serg@serg.mysql.com diff --git a/Docs/manual.texi b/Docs/manual.texi index ee711dbab3e..898a065545c 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -3021,8 +3021,8 @@ arrangements: The formal terms of the GPL license can be found at @ref{GPL license}. Basically, our licensing policy and intepretation of the GPL is as follows: -Note that older versions of @strong{MySQL} are still using a more strict -license. See the documentation for that version for more information. +Note that older versions of @strong{MySQL} are still using a more +@uref{http://www.mysql.com/support/arrangements/mypl.html, strict license}. See the documentation for that version for more information. If you need a commercial @strong{MySQL} license, because the GPL license doesn't suit your application, you can buy one at @uref{https://order.mysql.com/license.htmy}. |