diff options
| author | unknown <monty@donna.mysql.com> | 2000-11-18 02:15:57 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-11-18 02:15:57 +0200 |
| commit | 5abcec92c0abcc76658908791cf7f9d2fcc8004a (patch) | |
| tree | 5f4aca55a614d130b482e41534142b9b829f8f0a /BitKeeper | |
| parent | 0ffa94682eb3ec86bd3c45fdee68f5ecda5e6ab7 (diff) | |
| parent | 650e69e21d8d2e7778ee7706af17a325d015e7bd (diff) | |
| download | mariadb-git-5abcec92c0abcc76658908791cf7f9d2fcc8004a.tar.gz | |
Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 8de11b4fe16..e9b9b808409 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -4,3 +4,4 @@ monty@narttu.mysql.fi mwagner@work.mysql.com sasha@mysql.sashanet.com serg@serg.mysql.com +yfaktoro@nslinuxw2.bedford.progress.com |