diff options
| author | unknown <dlenev@brandersnatch.localdomain> | 2004-03-31 22:17:10 +0400 |
|---|---|---|
| committer | unknown <dlenev@brandersnatch.localdomain> | 2004-03-31 22:17:10 +0400 |
| commit | e6d766154709c920c010a96fb8d10295cd694dbc (patch) | |
| tree | 955a27f6963da17e12ea042cedc8a8ced053e0e6 /BitKeeper | |
| parent | 0dd6f77d47a9fbb857cf906ed025ebbc44137116 (diff) | |
| parent | d2906f0ed07bc06161d749d03ffa8acb7c09c785 (diff) | |
| download | mariadb-git-e6d766154709c920c010a96fb8d10295cd694dbc.tar.gz | |
Merge of fix for bug #2050 and bug #3307
BitKeeper/etc/logging_ok:
auto-union
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Manual merge
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 7a75d7a9873..1391f1e0a60 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -26,6 +26,7 @@ bk@admin.bk bk@mysql.r18.ru carsten@tsort.bitbybit.dk davida@isil.mysql.com +dlenev@brandersnatch.localdomain dlenev@build.mysql.com dlenev@mysql.com gerberb@ou800.zenez.com |