diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-08-07 21:19:43 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-08-07 21:19:43 +0300 |
| commit | f4646c0d063fb541f48dd2824ecccea464a9958d (patch) | |
| tree | ae1adf314b74af9f9885cef15ab9ffb8974d3e2d /BitKeeper | |
| parent | 553daa5e40b413489431d5d21b512c6b529bccac (diff) | |
| parent | b9aa175cb282ce92e733412a74e23ba750f8dd80 (diff) | |
| download | mariadb-git-f4646c0d063fb541f48dd2824ecccea464a9958d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
sql/item_func.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 b0b48e63980..f858af82736 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -23,6 +23,7 @@ davida@isil.mysql.com dlenev@mysql.com gluh@gluh.(none) gluh@gluh.mysql.r18.ru +greg@gcw.ath.cx greg@mysql.com guilhem@mysql.com gweir@build.mysql.com |