summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <peter@linux.local>2002-06-14 15:24:22 +0400
committerunknown <peter@linux.local>2002-06-14 15:24:22 +0400
commit501839ae29e00c98982039c11392a3a3572571fe (patch)
tree078f96d1dbfa166494f8a15402a1a84ecbc31d10 /BitKeeper
parent9cac831800272642f4c0783985c9a8a022a250dc (diff)
parent8451d47ac70f5840ec1d5fcfee2982f2a8cedc49 (diff)
downloadmariadb-git-501839ae29e00c98982039c11392a3a3572571fe.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')
-rw-r--r--BitKeeper/etc/logging_ok5
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