diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-06-02 00:03:39 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-06-02 00:03:39 +0300 |
| commit | 3e8412b89bd77cc72f16e020687713d916860d99 (patch) | |
| tree | a41716ccc31a720297599dd0ff72e758a3e22674 | |
| parent | 7c077e68f663e082924a359ecd3cfdfdedd88967 (diff) | |
| parent | 6c7dd0458105f6f27b1d6aaa44b80e21b2597251 (diff) | |
| download | mariadb-git-3e8412b89bd77cc72f16e020687713d916860d99.tar.gz | |
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
Docs/manual.texi:
Auto merged
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | Docs/manual.texi | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index ef8ceced1d3..0518f8664e3 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -3,3 +3,4 @@ monty@hundin.mysql.fi mwagner@evoq.mwagner.org heikki@donna.mysql.fi sasha@mysql.sashanet.com +paul@central.snake.net diff --git a/Docs/manual.texi b/Docs/manual.texi index 169297e16de..bc632668f24 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -45475,7 +45475,7 @@ Active mailing list member. Ported (and extended) the benchmark suite to @code{DBI}/@code{DBD}. Have been of great help with @code{crash-me} and running benchmarks. Some new date functions. The mysql_setpermissions script. -@item Jay Flaherty @email{fty@@utk.edu} +@item Jay Flaherty @email{fty@@mediapulse.com} Big parts of the Perl @code{DBI}/@code{DBD} section in the manual. @item Paul Southworth @email{pauls@@etext.org}, Ray Loyzaga @email{yar@@cs.su.oz.au} Proof-reading of the Reference Manual. |