summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <brian@brian-akers-computer.local>2004-04-05 22:35:23 -0700
committerunknown <brian@brian-akers-computer.local>2004-04-05 22:35:23 -0700
commit39bbecc4e7d0bfbf03f5205ecd7642176be2e6ff (patch)
tree6ae34b3a822a2459342dca131b4717f431261217 /BitKeeper
parent66de313563a74099d416767fec884ab590530d31 (diff)
parentbf3f491e6d72498db028792076de6472f0e11355 (diff)
downloadmariadb-git-39bbecc4e7d0bfbf03f5205ecd7642176be2e6ff.tar.gz
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1-examples BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok1
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 4067304c8e1..781956d363b 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -24,6 +24,7 @@ bell@laptop.sanja.is.com.ua
bell@sanja.is.com.ua
bk@admin.bk
bk@mysql.r18.ru
+brian@brian-akers-computer.local
carsten@tsort.bitbybit.dk
davida@isil.mysql.com
dlenev@brandersnatch.localdomain