diff options
| author | unknown <monty@mysql.com> | 2004-11-09 04:06:44 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-09 04:06:44 +0200 |
| commit | e0bf844c8ac4cd1efc9547637baac5201775a1c7 (patch) | |
| tree | a936b651bfe5aa74bd01c17224531d16117c29d9 /BitKeeper/etc | |
| parent | 20c82f5c014e9902f234f925a218895f3b91b154 (diff) | |
| parent | db67626196992923be83c12302d03cad35cf80f9 (diff) | |
| download | mariadb-git-e0bf844c8ac4cd1efc9547637baac5201775a1c7.tar.gz | |
merge on pull
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-Makefile.am:
Delete: Docs/Images/Makefile.am
configure.in:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'BitKeeper/etc')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index e7152099ed3..f09109774f9 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -98,12 +98,14 @@ kaj@work.mysql.com kent@mysql.com konstantin@mysql.com kostja@oak.local +lars@mysql.com lenz@kallisto.mysql.com lenz@mysql.com magnus@neptunus.(none) magnus@shellback.(none) marko@hundin.mysql.fi matt@mysql.com +matthias@three.local.lan miguel@hegel.(none) miguel@hegel.br miguel@hegel.local |