diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-11-16 17:53:22 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-11-16 17:53:22 -0700 |
| commit | 3dc874a7c09932191a8105fc922ea45fde751a67 (patch) | |
| tree | e5a75ad817a81098302cd4e933badfabe9e6ccae /BitKeeper | |
| parent | 07b4739b7cfdf86e1e0a384761617c300dc4042b (diff) | |
| parent | 6e8c7df035f12f12f276837838dfbff25d4bb2a6 (diff) | |
| download | mariadb-git-3dc874a7c09932191a8105fc922ea45fde751a67.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
BitKeeper/etc/logging_ok:
Auto converge
sql/log.cc:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 2fe7f501449..f3ef9f298a8 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,4 +1,4 @@ monty@donna.mysql.com +monty@narttu.mysql.fi sasha@mysql.sashanet.com serg@serg.mysql.com -monty@narttu.mysql.fi |