diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-04 08:29:08 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-04 08:29:08 +0300 |
| commit | daff6c5115b74c611222095fff40d075909ae454 (patch) | |
| tree | d273a823d7f94fdea3e5775b8d8cd0b912812b0f /BitKeeper | |
| parent | 08526ba32d9f4c353640b928edfdde862efc8596 (diff) | |
| parent | ad4e68655565878b31ac67ef1819d9ef29312c51 (diff) | |
| download | mariadb-git-daff6c5115b74c611222095fff40d075909ae454.tar.gz | |
merge with 4.0 to get last fixes to last merge
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/func_math.result:
Auto merged
sql/hostname.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
merge with 4.0
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 6a11e32ae48..c066d743ee1 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -50,6 +50,7 @@ sasha@mysql.sashanet.com serg@serg.mysql.com serg@sergbook.mysql.com sinisa@rhols221.adsl.netsonic.fi +tfr@indrek.tfr.cafe.ee tfr@sarvik.tfr.cafe.ee tim@bitch.mysql.fi tim@black.box |