diff options
| author | unknown <konstantin@mysql.com> | 2005-05-05 13:47:09 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-05-05 13:47:09 +0400 |
| commit | 7f33809731e31b20735c2aeed16cfdc19c3e9374 (patch) | |
| tree | d4d95ecf06af07753385c725dd79f59678cb5ffe /BitKeeper | |
| parent | a001bb2b9d6cb458b53b1ceb3d10be4d8dab2cbf (diff) | |
| parent | c758512a9176b40532f8431e7771f8dbeed77111 (diff) | |
| download | mariadb-git-7f33809731e31b20735c2aeed16cfdc19c3e9374.tar.gz | |
Manual merge
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/t/ndb_restore.test:
Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
Diffstat (limited to 'BitKeeper')
| -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 101e845ccf1..c7b5fa0f692 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -186,6 +186,7 @@ mysqldev@build.mysql2.com mysqldev@melody.local mysqldev@mysql.com mysqldev@o2k.irixworld.net +ndbdev@dl145b.mysql.com ndbdev@eel.hemma.oreland.se ndbdev@ndbmaster.mysql.com ndbdev@shark. @@ -268,6 +269,7 @@ tonu@x153.internalnet tonu@x3.internalnet tsmith@build.mysql.com tulin@build.mysql.com +tulin@dl145b.mysql.com tulin@mysql.com ulli@morbus.(none) venu@hundin.mysql.fi |