summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <rburnett@bk-internal.mysql.com>2005-05-06 15:10:01 +0200
committerunknown <rburnett@bk-internal.mysql.com>2005-05-06 15:10:01 +0200
commit6b819860e5fa83f1ba7c6025df8e227775bb1a1b (patch)
treec71943143e5639720df1bbb12f68ad2be6f17428 /BitKeeper
parent779ac9cf9e92deb2e3a9d55e3718b7f069998726 (diff)
parent9b2078d5a05e0578471b680eb79cbf4ba20c0950 (diff)
downloadmariadb-git-6b819860e5fa83f1ba7c6025df8e227775bb1a1b.tar.gz
Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into bk-internal.mysql.com:/users/rburnett/bug9721 BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok2
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index b77de4dbb49..5049352c8d4 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -86,6 +86,7 @@ jani@dsl-jkl1657.dial.inet.fi
jani@dsl-kpogw4gb5.dial.inet.fi
jani@hynda.(none)
jani@hynda.mysql.fi
+jani@ibmlab.site
jani@janikt.pp.saunalahti.fi
jani@rhols221.adsl.netsonic.fi
jani@rhols221.arenanet.fi
@@ -215,6 +216,7 @@ serg@serg.mysql.com
serg@sergbook.mylan
serg@sergbook.mysql.com
sergefp@mysql.com
+shuichi@mysql.com
sinisa@rhols221.adsl.netsonic.fi
stewart@mysql.com
svoj@mysql.com