diff options
| author | unknown <rburnett@bk-internal.mysql.com> | 2005-05-06 15:15:48 +0200 |
|---|---|---|
| committer | unknown <rburnett@bk-internal.mysql.com> | 2005-05-06 15:15:48 +0200 |
| commit | ce5552eca0d4c6e487a6c7e9e285e6dd2092374c (patch) | |
| tree | fc2e2665a3d8e35e9aabc5e2fe3eb3c34d0c85d3 /BitKeeper | |
| parent | 3d83f812371172e659a8af735c80a5b4983b1ce0 (diff) | |
| parent | 71c6170632b23930d3aaae920f9bed30131703b6 (diff) | |
| download | mariadb-git-ce5552eca0d4c6e487a6c7e9e285e6dd2092374c.tar.gz | |
Merge bk-internal.mysql.com:/users/rburnett/bug9721
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
include/violite.h:
Auto merged
sql/net_serv.cc:
Auto merged
vio/viosocket.c:
Auto merged
vio/viossl.c:
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 55477fe5d22..16950d3cb32 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -225,6 +225,7 @@ ram@ram-book.(none) ram@ram.(none) ramil@mysql.com ranger@regul.home.lan +rburnett@bk-internal.mysql.com rburnett@build.mysql.com reggie@bob.(none) reggie@mdk10.(none) |