diff options
| author | unknown <rburnett@build.mysql.com> | 2004-08-25 06:39:19 +0200 |
|---|---|---|
| committer | unknown <rburnett@build.mysql.com> | 2004-08-25 06:39:19 +0200 |
| commit | b15ee67874cf7abb683e122f2e78c4dffa9ff1b2 (patch) | |
| tree | 0cad8c896fbe9e4624de90e63fa1bc83d5b38203 /BitKeeper | |
| parent | 73fe243d43067860295148ed6eac1f742d16de26 (diff) | |
| parent | f2ef3d162eaf16bac68b7bc602be83cc7acf4f74 (diff) | |
| download | mariadb-git-b15ee67874cf7abb683e122f2e78c4dffa9ff1b2.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into build.mysql.com:/users/rburnett/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.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 d16de3077f3..f06024c89f1 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -110,6 +110,7 @@ ram@gw.mysql.r18.ru ram@mysql.r18.ru ram@ram.(none) ranger@regul.home.lan +rburnett@build.mysql.com root@x3.internalnet salle@geopard.(none) salle@geopard.online.bg |