diff options
| author | unknown <hf@bisonxp.(none)> | 2002-07-09 10:42:24 +0500 |
|---|---|---|
| committer | unknown <hf@bisonxp.(none)> | 2002-07-09 10:42:24 +0500 |
| commit | 2da868d45ca063f8c1c23fa06d290e5697d9b9a8 (patch) | |
| tree | b21a32ca85bae8d5e16f2b05a4cee9a8c74df6e1 /BitKeeper | |
| parent | 615c1e4fcf8943a19c6f246cacf5360cf9967298 (diff) | |
| parent | 7cbdd6de7eebbe76568d5de36b4457b9ffda5a84 (diff) | |
| download | mariadb-git-2da868d45ca063f8c1c23fa06d290e5697d9b9a8.tar.gz | |
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into bisonxp.(none):/home/hf/work/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 77fb78694c2..c299ad93cc3 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -14,6 +14,7 @@ davida@isil.mysql.com heikki@donna.mysql.fi heikki@hundin.mysql.fi hf@bison.(none) +hf@bisonxp.(none) jani@dsl-jkl1657.dial.inet.fi jani@hynda.(none) jani@hynda.mysql.fi @@ -66,7 +67,7 @@ tonu@x153.internalnet tonu@x3.internalnet venu@myvenu.com venu@work.mysql.com +walrus@mysql.com worm@altair.is.lan zak@balfor.local zak@linux.local -hf@bisonxp.(none) |