diff options
| author | unknown <hf@genie.(none)> | 2002-09-17 10:50:25 +0500 |
|---|---|---|
| committer | unknown <hf@genie.(none)> | 2002-09-17 10:50:25 +0500 |
| commit | c73eee3a9b873c51175cc99702e25a23f0f0550a (patch) | |
| tree | 2b225ed9a686560fe28e7b286e239706aca350ab /BitKeeper | |
| parent | 1a7246752b59af35ba694c6faec787c1058717f9 (diff) | |
| parent | 22fbc173c41ac29e1184307847df704fd78a7513 (diff) | |
| download | mariadb-git-c73eee3a9b873c51175cc99702e25a23f0f0550a.tar.gz | |
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/hf/work/mysql-4.1
sql/item_strfunc.cc:
Auto merged
sql/sql_show.cc:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
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 590ec192a2e..059ecc963d9 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -76,3 +76,4 @@ walrus@mysql.com worm@altair.is.lan zak@balfor.local zak@linux.local +hf@genie.(none) |