diff options
| author | unknown <marty@flipper.bredbandsbolaget.se> | 2005-06-23 10:58:37 +0200 |
|---|---|---|
| committer | unknown <marty@flipper.bredbandsbolaget.se> | 2005-06-23 10:58:37 +0200 |
| commit | ed439bc6a2b1b02c65f0a93078488ddd9e8a13fc (patch) | |
| tree | cb7fd7068d67fac6b8197f74309105291303b970 /BitKeeper | |
| parent | 81a7a93f421547640afcdb0ecef1c1717152d27a (diff) | |
| parent | 9dfb7aab152881736329e66bf1ea1e471753ebe9 (diff) | |
| download | mariadb-git-ed439bc6a2b1b02c65f0a93078488ddd9e8a13fc.tar.gz | |
Merge flipper.bredbandsbolaget.se:/home/marty/MySQL/mysql-5.0
into flipper.bredbandsbolaget.se:/home/marty/MySQL/mysql-5.1
sql/ha_federated.cc:
Auto merged
sql/item.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
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 4c3233817ab..416ab8dbbde 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -140,6 +140,7 @@ magnus@msdesk.mysql.com magnus@neptunus.(none) magnus@shellback.(none) marko@hundin.mysql.fi +marty@flipper.bredbandsbolaget.se marty@linux.site marty@shark. mats@mysql.com |