diff options
author | unknown <marty@shark.> | 2004-12-20 14:02:42 +0100 |
---|---|---|
committer | unknown <marty@shark.> | 2004-12-20 14:02:42 +0100 |
commit | 2dab2c1e6629384dfb13ff2d25ae8e80dfdaad9b (patch) | |
tree | 90489155ecf729bb0d4ca2b48b56e9792cc75e53 /BitKeeper | |
parent | e919f25d61bb88834f568470a65eb3f218354d72 (diff) | |
parent | 050823dbb5c606ba7efd4fe878218a4a1b66a81f (diff) | |
download | mariadb-git-2dab2c1e6629384dfb13ff2d25ae8e80dfdaad9b.tar.gz |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into shark.:/home/marty/MySQL/mysql-5.0-ndb
BitKeeper/etc/logging_ok:
auto-union
Diffstat (limited to 'BitKeeper')
-rw-r--r-- | BitKeeper/etc/logging_ok | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 4df8c33212b..778911f1479 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -108,6 +108,7 @@ lenz@mysql.com magnus@neptunus.(none) magnus@shellback.(none) marko@hundin.mysql.fi +marty@shark. mats@mysql.com matt@mysql.com matthias@three.local.lan |