diff options
| author | unknown <holyfoot@mysql.com> | 2005-05-05 20:10:50 +0500 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2005-05-05 20:10:50 +0500 |
| commit | 54d57ffd2fb76b7f9862fafbeafb61d0bc0f5e6a (patch) | |
| tree | 3f204c3403c7fb8a183d404401fc950f84c4f470 /BitKeeper/etc | |
| parent | b6317e3ac0b756d28788ad686cfad4c513ea8cba (diff) | |
| parent | 6de14a23f7de447e4e6c4b82e2be032b05214c9a (diff) | |
| download | mariadb-git-54d57ffd2fb76b7f9862fafbeafb61d0bc0f5e6a.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/item.h:
SCCS merged
Diffstat (limited to 'BitKeeper/etc')
| -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 c7b5fa0f692..e1b7579a4f8 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -82,6 +82,7 @@ hf@bisonxp.(none) hf@deer.(none) hf@deer.mysql.r18.ru hf@genie.(none) +holyfoot@mysql.com igor@hundin.mysql.fi igor@linux.local igor@rurik.mysql.com |