diff options
| author | unknown <bar@eagle.intranet.mysql.r18.ru> | 2005-03-25 10:43:35 +0400 |
|---|---|---|
| committer | unknown <bar@eagle.intranet.mysql.r18.ru> | 2005-03-25 10:43:35 +0400 |
| commit | 12664c053149c4af13b40a4a9663fc7816ae375a (patch) | |
| tree | be8c2e805ee462b2b1ae5dc0f8e3e3b9ca664eb4 /BitKeeper | |
| parent | 4f1e4973945ff07deb7f50c45a10394be09b07c2 (diff) | |
| parent | ed124ab6b7be6a7a56831407b175068c096232cb (diff) | |
| download | mariadb-git-12664c053149c4af13b40a4a9663fc7816ae375a.tar.gz | |
Merge
myisam/myisamchk.c:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.h:
Auto merged
mysql-test/r/func_str.result:
merging
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 96cdd930e83..22808697471 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -25,6 +25,7 @@ bar@bar.intranet.mysql.r18.ru bar@bar.mysql.r18.ru bar@bar.udmsearch.izhnet.ru bar@deer.(none) +bar@eagle.intranet.mysql.r18.ru bar@gw.udmsearch.izhnet.ru bar@mysql.com bar@noter.intranet.mysql.r18.ru |