diff options
author | unknown <tim@donna.mysql.com> | 2001-02-20 23:28:56 +0200 |
---|---|---|
committer | unknown <tim@donna.mysql.com> | 2001-02-20 23:28:56 +0200 |
commit | b53d7383798665d58da31b8184ad8ead2ea3f892 (patch) | |
tree | 8cd9522bc8ae0ca1cb6ddd27ab948773f5e4cc72 /BitKeeper/etc | |
parent | eedae8056df97110bda3d56fe30fa17120e34504 (diff) | |
parent | fc58b42fbfa0f0381efc68e5dd0f5e83f75500c1 (diff) | |
download | mariadb-git-b53d7383798665d58da31b8184ad8ead2ea3f892.tar.gz |
Merge donna.mysql.com:/home/my/bk/mysql
into donna.mysql.com:/home/tim/my/work
innobase/configure.in:
Auto merged
innobase/include/lock0types.h:
Auto merged
innobase/include/os0sync.h:
Auto merged
innobase/include/sync0types.h:
Auto merged
sql/ha_innobase.cc:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'BitKeeper/etc')
-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 c2b6edfd4a9..125d5ca0f03 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -12,3 +12,4 @@ tfr@coyote.emotion.ee tim@cane.mysql.fi tim@threads.polyesthetic.msg tim@work.mysql.com +tim@donna.mysql.com |