diff options
| author | unknown <mskold@mysql.com> | 2005-05-08 22:52:55 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-05-08 22:52:55 +0200 |
| commit | b40842f2620e95a8863a044eaf6c53b2582f7f4c (patch) | |
| tree | 03c1c2a456b5b2796869f8a8ee6972995f66c438 /BitKeeper | |
| parent | 69231460840564d09c1b45c298f87c75447b3ead (diff) | |
| parent | c0f4ae6be95656d5dcc8fff6ba7000247baebaa7 (diff) | |
| download | mariadb-git-b40842f2620e95a8863a044eaf6c53b2582f7f4c.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211:
Auto merged
configure.in:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/ha_blackhole.cc:
Auto merged
sql/share/Makefile.am:
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 01726f15985..311403f93e6 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -181,6 +181,7 @@ mwagner@cash.mwagner.org mwagner@evoq.mwagner.org mwagner@here.mwagner.org mwagner@mysql.com +mwagner@ultrafly.mysql.com mwagner@work.mysql.com mydev@mysql.com mysql@home.(none) |