diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-09-21 12:56:05 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-09-21 12:56:05 +0000 |
| commit | 9088cbeacabe932fc7b7fc51d8896d11980f955d (patch) | |
| tree | 2276a8762e96a2bf5d0c0a97d2e1bf8df528315e /BitKeeper | |
| parent | 65c617afc35931069fa32fbc47e7aeb9a8b38281 (diff) | |
| parent | c7deb0d6759f6f1cac1f030331b8202cfcc5b244 (diff) | |
| download | mariadb-git-9088cbeacabe932fc7b7fc51d8896d11980f955d.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
sql/ha_ndbcluster.cc:
SCCS 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 cc4f31cf414..6520b17e787 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -30,6 +30,7 @@ bk@admin.bk bk@mysql.r18.ru brian@avenger.(none) brian@brian-akers-computer.local +brian@private-client-ip-101.oz.net carsten@tsort.bitbybit.dk davida@isil.mysql.com dlenev@brandersnatch.localdomain |