diff options
| author | unknown <serg@serg.mylan> | 2005-03-23 09:42:24 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-23 09:42:24 +0100 |
| commit | d27a709f3d811718c4174beeb0bd2d964bfcf87c (patch) | |
| tree | bfec7a86898321f85706b5331aa18fdb1bc68fbb /BitKeeper | |
| parent | 903d1b6b51345213fba70e144873aa4a9f6b7c0c (diff) | |
| parent | e2ca9c5b41df8f18f44e0529a72b141a9fc2b01b (diff) | |
| download | mariadb-git-d27a709f3d811718c4174beeb0bd2d964bfcf87c.tar.gz | |
merged
BitKeeper/etc/logging_ok:
auto-union
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/ndb_autodiscover.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/view.result:
Auto merged
scripts/fill_func_tables.sh:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
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 543e9e677a2..96cdd930e83 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -227,6 +227,7 @@ salle@vafla.online.bg sasha@mysql.sashanet.com serg@build.mysql.com serg@build.mysql2.com +serg@mysql.com serg@serg.mylan serg@serg.mysql.com serg@sergbook.mylan |