diff options
| author | unknown <monty@work.mysql.com> | 2001-10-02 21:33:47 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-10-02 21:33:47 +0200 |
| commit | 2e0dc69895280f3b407e56dace32ad9cf25ce356 (patch) | |
| tree | d9089456ab1e47d6aaaaf6706de408fea79fe87e /BitKeeper | |
| parent | 9b3d608ea7de5da60bd88765b4a52d316dffa708 (diff) | |
| parent | abf1b80cf457702fd883c3a17b1d9eaed1c7c6b6 (diff) | |
| download | mariadb-git-2e0dc69895280f3b407e56dace32ad9cf25ce356.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
client/Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
myisam/mi_check.c:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
strings/strmake.c:
Auto merged
mysql-test/t/rpl000017-slave.sh:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 16af71fd78d..981f46c3256 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,3 +1,4 @@ +Administrator@fred. Miguel@light.local Sinisa@sinisa.nasamreza.org davida@isil.mysql.com @@ -30,4 +31,3 @@ tonu@hundin.mysql.fi tonu@volk.internalnet tonu@x153.internalnet tonu@x3.internalnet -Administrator@fred. |