diff options
| author | unknown <serg@build.mysql2.com> | 2002-09-23 16:39:18 +0200 |
|---|---|---|
| committer | unknown <serg@build.mysql2.com> | 2002-09-23 16:39:18 +0200 |
| commit | d2083add3aa4a719dc589f7eda9c338f5e270926 (patch) | |
| tree | 3e9c8114c4d1621f47a24e7a5939634dbbf76466 /BitKeeper | |
| parent | 21afbc4c57e384ebebff1a6c91b3ba23afdcdeb8 (diff) | |
| parent | 41f7307a18a1f6bdb8326ec28508614fc1b28afe (diff) | |
| download | mariadb-git-d2083add3aa4a719dc589f7eda9c338f5e270926.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
sql/sql_yacc.yy:
merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index c61cab617ba..942ea88713a 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -58,6 +58,7 @@ root@x3.internalnet salle@geopard.(none) salle@geopard.online.bg sasha@mysql.sashanet.com +serg@build.mysql2.com serg@serg.mysql.com serg@sergbook.mysql.com sinisa@rhols221.adsl.netsonic.fi @@ -75,9 +76,9 @@ tonu@volk.internalnet tonu@x153.internalnet tonu@x3.internalnet venu@work.mysql.com +vva@genie.(none) walrus@mysql.com worm@altair.is.lan zak@balfor.local zak@linux.local zgreant@mysql.com -vva@genie.(none) |