diff options
| author | unknown <hf@deer.(none)> | 2003-05-28 13:54:58 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-05-28 13:54:58 +0500 |
| commit | 7b2e06b281639a7d67d61da4545a292e831c94f5 (patch) | |
| tree | e58c9f81824de010188d299a9cdbb4d6794ec856 /BitKeeper/etc | |
| parent | 15b3f3a0d8c11babff0f2e4dfa81c1716bcf533d (diff) | |
| parent | a1e47ce8ee3746a6ecf05d8c4707bea914fa14be (diff) | |
| download | mariadb-git-7b2e06b281639a7d67d61da4545a292e831c94f5.tar.gz | |
Lots of conflicts resolved
libmysqld/Makefile.am:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
libmysql/libmysql.c:
Resolved conflicts
sql/mini_client.cc:
resolved conflicts
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'BitKeeper/etc')
| -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 065b2aee15b..5fc0be183e1 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -29,6 +29,7 @@ heikki@rescue. heikki@work.mysql.com hf@bison.(none) hf@bisonxp.(none) +hf@deer.(none) hf@deer.mysql.r18.ru hf@genie.(none) igor@hundin.mysql.fi |