summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-11-12 11:17:53 +0200
committermonty@mysql.com <>2004-11-12 11:17:53 +0200
commit9252656d4985a4b35ccef85c127875978ace3990 (patch)
tree59f4a8722fd9657366da60b4af149031105872ab /BitKeeper
parentbfe2917f8978f2a5fcf99ccee294bb919a5eab52 (diff)
parent2ad7d5c662d785664ac3690240e89ce8d11ed21f (diff)
downloadmariadb-git-9252656d4985a4b35ccef85c127875978ace3990.tar.gz
merge with 4.0
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 ac02fa84bbc..1f1918027e2 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -195,6 +195,7 @@ tim@bitch.mysql.fi
tim@black.box
tim@hundin.mysql.fi
tim@sand.box
+tim@siva.hindu.god
tim@threads.polyesthetic.msg
tim@white.box
tim@work.mysql.com