diff options
| author | unknown <monty@rescue.> | 2002-09-05 17:17:21 +0300 |
|---|---|---|
| committer | unknown <monty@rescue.> | 2002-09-05 17:17:21 +0300 |
| commit | 60d9eb907244483e82b67cd920e03d4147bac349 (patch) | |
| tree | fa68e03dc82462c38cc8ea70c9b2174809f7c014 /BitKeeper | |
| parent | 0523910ac4efa67db861a836d9cbe9a5a127e496 (diff) | |
| parent | c37aa34aa063457bf2d901ea3dc43271f4b5db5b (diff) | |
| download | mariadb-git-60d9eb907244483e82b67cd920e03d4147bac349.tar.gz | |
Merge work:/home/bk/mysql-4.0 into rescue.:/my/bk/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
sql/ha_innodb.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 5a913bef98b..6318a413179 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -14,6 +14,7 @@ bell@sanja.is.com.ua davida@isil.mysql.com heikki@donna.mysql.fi heikki@hundin.mysql.fi +heikki@rescue. heikki@work.mysql.com jani@dsl-jkl1657.dial.inet.fi jani@hynda.(none) |