diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2003-03-11 13:52:19 +0400 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2003-03-11 13:52:19 +0400 |
| commit | f1662f3be98e95de065599497220a587fe3173c5 (patch) | |
| tree | 32987b7040ee20fa95c8ca4e74562a8c2f3b9054 /BitKeeper | |
| parent | f26a8b6fb8b87c1ca28db36d5252ad7bf8b0f3d7 (diff) | |
| parent | 3ab655681c4dc87226f3048a60d4ad3abf310f72 (diff) | |
| download | mariadb-git-f1662f3be98e95de065599497220a587fe3173c5.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.last
BitKeeper/etc/logging_ok:
auto-union
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
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 ae739832bad..dbff0adc758 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -15,6 +15,7 @@ bell@sanja.is.com.ua bk@admin.bk davida@isil.mysql.com gluh@gluh.(none) +gluh@gluh.mysql.r18.ru greg@mysql.com guilhem@mysql.com gweir@work.mysql.com |