diff options
| author | unknown <peter@linux.local> | 2002-06-14 15:24:22 +0400 |
|---|---|---|
| committer | unknown <peter@linux.local> | 2002-06-14 15:24:22 +0400 |
| commit | e5139bd58890eaa613d77e4b45a7e763134789f4 (patch) | |
| tree | 078f96d1dbfa166494f8a15402a1a84ecbc31d10 /BitKeeper/etc/logging_ok | |
| parent | ffb53ea0e22cbf0f6d40ab55d735f5506e1deeb7 (diff) | |
| parent | 0342d6a72b2783cbbaeaf6f5ae1bf8f7bd7d2cd7 (diff) | |
| download | mariadb-git-e5139bd58890eaa613d77e4b45a7e763134789f4.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
sql/item_create.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/lex.h:
Auto merged
client/mysqldump.c:
SCCS merged
Diffstat (limited to 'BitKeeper/etc/logging_ok')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index a8c714a984a..6d26d6294b6 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -32,6 +32,7 @@ miguel@light.local monty@bitch.mysql.fi monty@donna.mysql.fi monty@hundin.mysql.fi +monty@mashka.mysql.fi monty@narttu. monty@narttu.mysql.fi monty@tik. @@ -43,11 +44,13 @@ mwagner@evoq.mwagner.org nick@nick.leippe.com paul@central.snake.net paul@teton.kitebird.com +peter@linux.local root@x3.internalnet sasha@mysql.sashanet.com serg@serg.mysql.com serg@sergbook.mysql.com sinisa@rhols221.adsl.netsonic.fi +tfr@indrek.tfr.cafe.ee tfr@sarvik.tfr.cafe.ee tim@bitch.mysql.fi tim@black.box @@ -64,5 +67,3 @@ venu@work.mysql.com worm@altair.is.lan zak@balfor.local zak@linux.local -tfr@indrek.tfr.cafe.ee -monty@mashka.mysql.fi |