diff options
author | unknown <ram@mysql.r18.ru> | 2003-02-26 19:23:11 +0400 |
---|---|---|
committer | unknown <ram@mysql.r18.ru> | 2003-02-26 19:23:11 +0400 |
commit | 29cc3529dbcba9fd190e01142bde5785be8dcc0b (patch) | |
tree | dc2dc0d975a191c52bdf40ae8e82b0ae8256c7cc /BitKeeper | |
parent | a13785d21985fc00659baa28b97a3ec925719378 (diff) | |
parent | 608bd7882ad7d31ed9b7ed7dbd93c405bfda8c13 (diff) | |
download | mariadb-git-29cc3529dbcba9fd190e01142bde5785be8dcc0b.tar.gz |
Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
sql/spatial.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 e06e7ccef50..c28491c9e33 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -18,6 +18,7 @@ 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 heikki@donna.mysql.fi |