summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <mskold@mysql.com>2004-12-30 21:36:16 +0100
committerunknown <mskold@mysql.com>2004-12-30 21:36:16 +0100
commitade13078d13932f55c7c49acd36c95e5af2d9543 (patch)
tree746329a45317e19c2594cae58dd104e9500f554e /BitKeeper
parent12b08e569431a9d98baf0e2f03d1c024259b3d07 (diff)
parent523882ab71ee8b1d9e4c0f682b96069d5f8d83c9 (diff)
downloadmariadb-git-ade13078d13932f55c7c49acd36c95e5af2d9543.tar.gz
Merged bugfix
BitKeeper/etc/logging_ok: auto-union sql/ha_ndbcluster.h: Auto merged
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 782259dea02..f8dd043ff10 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -103,6 +103,7 @@ lenz@mysql.com
magnus@neptunus.(none)
magnus@shellback.(none)
marko@hundin.mysql.fi
+marty@linux.site
mats@mysql.com
matt@booty.(none)
matt@mysql.com