diff options
| author | unknown <igor@rurik.mysql.com> | 2005-06-07 06:38:05 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-06-07 06:38:05 -0700 |
| commit | 3145787db91432deaaf51437855c06e7b26e8fe2 (patch) | |
| tree | 874410a623b21d2d3f837cc2e0e3c566f7a425be /BitKeeper/etc/logging_ok | |
| parent | e5a97df6631a3ae9f2cc96eeeb4854593e3a79d4 (diff) | |
| parent | d499ead64c468cab0fb03b98568e01bfd971f7b3 (diff) | |
| download | mariadb-git-3145787db91432deaaf51437855c06e7b26e8fe2.tar.gz | |
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
myisam/mi_key.c:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
sql/item_buff.cc:
Auto merged
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'BitKeeper/etc/logging_ok')
| -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 eaf79d29cee..f1e98699ab0 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -52,6 +52,7 @@ dlenev@build.mysql.com dlenev@jabberwock.localdomain dlenev@mysql.com ejonore@mc03.ndb.mysql.com +elliot@mysql.com evgen@moonbone.(none) evgen@moonbone.local gbichot@bk-internal.mysql.com |