diff options
| author | unknown <mysqldev@bk-internal.mysql.com> | 2004-12-17 11:46:44 +0100 |
|---|---|---|
| committer | unknown <mysqldev@bk-internal.mysql.com> | 2004-12-17 11:46:44 +0100 |
| commit | af5a042c272c5671834d850b61ae3c6896fb94d9 (patch) | |
| tree | 0c3e4394338adb48cefde22414bd874f7839961e /BitKeeper | |
| parent | 71424cb1c4de768440b0ab10dfb1d0ba6bde0483 (diff) | |
| parent | bf532e26d117201931718d5eab90ba93a17d3510 (diff) | |
| download | mariadb-git-af5a042c272c5671834d850b61ae3c6896fb94d9.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into bk-internal.mysql.com:/data0/bk/mysql-4.1-cluster-extra
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_cache.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 f4e5f08ae63..f9508e6c6c9 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -147,6 +147,7 @@ mwagner@work.mysql.com mydev@mysql.com mysql@home.(none) mysql@mc04.(none) +mysqldev@bk-internal.mysql.com mysqldev@build.mysql2.com mysqldev@melody.local mysqldev@mysql.com |