diff options
| author | unknown <sergefp@mysql.com> | 2003-12-20 00:54:38 +0300 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2003-12-20 00:54:38 +0300 |
| commit | c0d9d43739df0bf92b83a6b328485c1f357ea253 (patch) | |
| tree | 6f1ee123b4c43806a2d62ab70bfdc1402e51dff9 /BitKeeper | |
| parent | 28ad1273ddf3d42a4ec9f9fdfdd150f39fa4772e (diff) | |
| parent | b41e6294ca97aaeb403972feb19ecc6d177096ca (diff) | |
| download | mariadb-git-c0d9d43739df0bf92b83a6b328485c1f357ea253.tar.gz | |
Merge mysql.com:/home/psergey/mysql-5.0-latest-pull
into mysql.com:/dbdata/psergey/mysql-5.0-imerge-unique
BitKeeper/etc/logging_ok:
auto-union
include/my_global.h:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/records.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/uniques.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 c9fe18eed46..a28e7dc78f0 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -13,6 +13,7 @@ antony@ltantony.rdg.cyberkinetica.homeunix.net arjen@co3064164-a.bitbike.com arjen@fred.bitbike.com arjen@george.bitbike.com +bar@bar.intranet.mysql.r18.ru bar@bar.mysql.r18.ru bar@bar.udmsearch.izhnet.ru bar@gw.udmsearch.izhnet.ru |