summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-08-15 15:57:47 -0600
committerunknown <sasha@mysql.sashanet.com>2001-08-15 15:57:47 -0600
commitabb2aaa2792183168b11479a9b99d5d700667e1e (patch)
treea77300d361c4ea8556793f6c691e3b2812accf0c /BitKeeper
parentaaf71625ea95f8163eb66a095ed00ea1953e3e7e (diff)
parent2b8614210d1db003a6827f301dad0321b1a7478e (diff)
downloadmariadb-git-abb2aaa2792183168b11479a9b99d5d700667e1e.tar.gz
merged replication fixes from 3.23
BitKeeper/etc/logging_ok: auto-union Docs/manual.texi: merged sql/mini_client.cc: merged sql/mysqld.cc: merged sql/sql_repl.cc: 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 c8e74a50186..81a2ba694f7 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -18,6 +18,7 @@ paul@teton.kitebird.com
root@x3.internalnet
sasha@mysql.sashanet.com
serg@serg.mysql.com
+tfr@sarvik.tfr.cafe.ee
tim@bitch.mysql.fi
tim@black.box
tim@hundin.mysql.fi