diff options
| author | unknown <monty@work.mysql.com> | 2001-09-28 06:28:04 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-09-28 06:28:04 +0200 |
| commit | 1a57e278c2bf3b93d218cb0f610ba5d3a74e8968 (patch) | |
| tree | a6b1c8b90c5b9593ce01cf029acb8150d80a1922 /BitKeeper | |
| parent | a353f6249ce88e6b652e3a8b15af4a3f5f96bc72 (diff) | |
| parent | 6ba992fb5da4069b5d77e2cfd143d075a7ce07ee (diff) | |
| download | mariadb-git-1a57e278c2bf3b93d218cb0f610ba5d3a74e8968.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
acinclude.m4:
Auto merged
mysql-test/r/null_key.result:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/udf_example.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index c2b351eb968..5d7b0e25c86 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,3 +1,4 @@ +Miguel@light.local Sinisa@sinisa.nasamreza.org davida@isil.mysql.com heikki@donna.mysql.fi @@ -26,6 +27,6 @@ tim@threads.polyesthetic.msg tim@white.box tim@work.mysql.com tonu@hundin.mysql.fi +tonu@volk.internalnet tonu@x153.internalnet tonu@x3.internalnet -tonu@volk.internalnet |