diff options
| author | unknown <mats@mysql.com> | 2004-11-25 12:23:41 +0100 |
|---|---|---|
| committer | unknown <mats@mysql.com> | 2004-11-25 12:23:41 +0100 |
| commit | c4dbf1e969253f3b65106036af0f47a600a77ad5 (patch) | |
| tree | dbd5eed33a764e82c97cd90f56cdda2eb22fef63 /BitKeeper | |
| parent | 32c3009d3a8bd1a0ea591977cf878795625e592c (diff) | |
| parent | 467c481479ac511cc445b9703260e9b3bb8b2e96 (diff) | |
| download | mariadb-git-c4dbf1e969253f3b65106036af0f47a600a77ad5.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/repl_failsafe.cc:
Merging 4.0 and 4.1 changes.
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 8fcec769a0c..0483e6b4fa3 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -101,6 +101,7 @@ lenz@mysql.com magnus@neptunus.(none) magnus@shellback.(none) marko@hundin.mysql.fi +mats@mysql.com matt@mysql.com matthias@three.local.lan miguel@hegel.(none) |