diff options
| author | unknown <magnus@shellback.(none)> | 2004-09-26 16:21:15 +0200 |
|---|---|---|
| committer | unknown <magnus@shellback.(none)> | 2004-09-26 16:21:15 +0200 |
| commit | 1dd76e19315f4a225788ff284c32c7f3a5dc0dbc (patch) | |
| tree | ef18255527c2519d9c95e16262e3f78ec4f7eaee /BitKeeper | |
| parent | 5077ba47ad95f166b107dd4da29ae595516e85ab (diff) | |
| parent | a64953ed3f469e3efdff4dd6462a1756675459b6 (diff) | |
| download | mariadb-git-1dd76e19315f4a225788ff284c32c7f3a5dc0dbc.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
mysql-test/mysql-test-run.sh:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/sql_show.cc:
Auto merged
sql/ha_ndbcluster.cc:
SCCS merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 6bedef8bf18..39b502580d9 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -24,12 +24,14 @@ bar@bar.udmsearch.izhnet.ru bar@deer.(none) bar@gw.udmsearch.izhnet.ru bar@mysql.com +bar@noter.intranet.mysql.r18.ru bell@laptop.sanja.is.com.ua bell@sanja.is.com.ua 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 |