diff options
| author | unknown <monty@work.mysql.com> | 2001-06-28 14:51:18 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-06-28 14:51:18 +0200 |
| commit | 05e9925ada524fb99222087d4be3c70ab02e2047 (patch) | |
| tree | 4aedefbe00db5d011d169380502c5e1f1383c1e9 /BitKeeper | |
| parent | 210e8642135244f73681b5d63d3fc92ba0c29ba3 (diff) | |
| parent | 1a5643b4b19f0ac40b7fe48a693f1ec348b7952b (diff) | |
| download | mariadb-git-05e9925ada524fb99222087d4be3c70ab02e2047.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
myisam/myisamchk.c:
Auto merged
mysql-test/r/drop.result:
Auto merged
mysql-test/t/drop.test:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/sql_lex.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 93b5d236970..9e28a3403be 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -17,7 +17,7 @@ sasha@mysql.sashanet.com serg@serg.mysql.com tim@hundin.mysql.fi tim@threads.polyesthetic.msg +tim@white.box tim@work.mysql.com tonu@hundin.mysql.fi tonu@x3.internalnet -tim@white.box |