diff options
| author | unknown <reggie@bob.(none)> | 2005-01-17 14:08:36 -0600 |
|---|---|---|
| committer | unknown <reggie@bob.(none)> | 2005-01-17 14:08:36 -0600 |
| commit | 5847d10712fac59beae024c76b8b6ef13d0df558 (patch) | |
| tree | 0f919d7354ffd61b6beeeeb265b86ddb9d3cddf6 /BitKeeper | |
| parent | 0b076d2c1fa0df44033ca43a5f384eefaba71c9b (diff) | |
| parent | f6f90e7dc1ae497ac25941fc6b709f18a5d46c46 (diff) | |
| download | mariadb-git-5847d10712fac59beae024c76b8b6ef13d0df558.tar.gz | |
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into bob.(none):/home/reggie/bk/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
client/mysql.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 7ff770e8fbb..52b8b0584bc 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -181,6 +181,7 @@ ram@mysql.r18.ru ram@ram.(none) ranger@regul.home.lan rburnett@build.mysql.com +reggie@bob.(none) root@home.(none) root@mc04.(none) root@x3.internalnet |