diff options
| author | jimw@mysql.com <> | 2005-05-18 11:06:34 -0700 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-05-18 11:06:34 -0700 |
| commit | 3f6aad900c34707b58c6fffb7f90d044f6c351ac (patch) | |
| tree | 384afb929b09dd50f92ab7de3d46902df3cb3e4e /BitKeeper | |
| parent | e7c62822541d3538672dd0adc54f8d55eb46a00d (diff) | |
| parent | af557076fa590c390ab35ab3584e5d8dfe640e0a (diff) | |
| download | mariadb-git-3f6aad900c34707b58c6fffb7f90d044f6c351ac.tar.gz | |
Resolve merge from 4.1
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 31ed6abe28c..8e03cb3bad2 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -282,6 +282,7 @@ tonu@x3.internalnet tsmith@build.mysql.com tulin@build.mysql.com tulin@dl145b.mysql.com +tulin@dl145c.mysql.com tulin@mysql.com ulli@morbus.(none) venu@hundin.mysql.fi |