diff options
| author | unknown <bell@51.0.168.192.in-addr.arpa> | 2005-02-24 01:11:59 +0200 |
|---|---|---|
| committer | unknown <bell@51.0.168.192.in-addr.arpa> | 2005-02-24 01:11:59 +0200 |
| commit | c5fb55668bae85aa32e9b33a9a5ad012f0f4286a (patch) | |
| tree | 9ea16789aa1959066d8ace22ebc8dfb2ae6ba326 /BitKeeper | |
| parent | f5a80e5a3b74b6dd107a85fe77a4061722de9b2c (diff) | |
| parent | 52bba384fc034ccc68dbf717f6950049d61eb6bf (diff) | |
| download | mariadb-git-c5fb55668bae85aa32e9b33a9a5ad012f0f4286a.tar.gz | |
Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
BitKeeper/etc/logging_ok:
auto-union
sql/sql_parse.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 2b8f144a9df..89e1ff4bd48 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -208,6 +208,7 @@ ramil@mysql.com ranger@regul.home.lan rburnett@build.mysql.com reggie@bob.(none) +reggie@mdk10.(none) root@home.(none) root@mc04.(none) root@x3.internalnet |