diff options
| author | unknown <serg@sergbook.mysql.com> | 2002-08-13 21:15:14 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2002-08-13 21:15:14 +0200 |
| commit | 2ae0e1c428d2ff8156857bdf330d47a03f8d4694 (patch) | |
| tree | 38d09532a47fe0e122ee2784598122bbac63d15d /BitKeeper | |
| parent | de849d7d3d9116716bb59d31f737368d42f3f328 (diff) | |
| parent | 9d0e328f7ac033bd37899ad667c2b69eed3793fe (diff) | |
| download | mariadb-git-2ae0e1c428d2ff8156857bdf330d47a03f8d4694.tar.gz | |
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-stamp-h.in~d3fb1119ddf3630f:
Auto merged
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
strings/Makefile.am:
Auto 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 5c0d5076d9a..45d47bdb45b 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -8,6 +8,7 @@ akishkin@work.mysql.com arjen@co3064164-a.bitbike.com arjen@fred.bitbike.com arjen@george.bitbike.com +bar@bar.mysql.r18.ru bar@bar.udmsearch.izhnet.ru bell@sanja.is.com.ua davida@isil.mysql.com @@ -47,6 +48,7 @@ paul@central.snake.net paul@teton.kitebird.com peter@linux.local peter@mysql.com +ram@ram.(none) root@x3.internalnet salle@geopard.(none) salle@geopard.online.bg @@ -73,4 +75,3 @@ worm@altair.is.lan zak@balfor.local zak@linux.local zgreant@mysql.com -ram@ram.(none) |