diff options
| author | unknown <jani@a80-186-41-201.elisa-laajakaista.fi> | 2004-10-07 22:09:14 +0300 |
|---|---|---|
| committer | unknown <jani@a80-186-41-201.elisa-laajakaista.fi> | 2004-10-07 22:09:14 +0300 |
| commit | 26f348c91033178d1c8e758cfffc91d1259386b0 (patch) | |
| tree | c26e086738ee12e6734c31fb1b4e70cf0026caf1 /BitKeeper | |
| parent | 7efa215e254dc21ec89a30578669d31064d15f9c (diff) | |
| parent | d39ea1fdad104e3262f479653cc4cc9d05f39aea (diff) | |
| download | mariadb-git-26f348c91033178d1c8e758cfffc91d1259386b0.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into a80-186-41-201.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
client/mysqladmin.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
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 ac45466be22..a647da7b302 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -67,6 +67,7 @@ igor@rurik.mysql.com ingo@mysql.com jan@hundin.mysql.fi jani@a80-186-24-72.elisa-laajakaista.fi +jani@a80-186-41-201.elisa-laajakaista.fi jani@dsl-jkl1657.dial.inet.fi jani@dsl-kpogw4gb5.dial.inet.fi jani@hynda.(none) |