diff options
| author | unknown <hf@deer.mysql.r18.ru> | 2003-01-15 13:15:35 +0400 |
|---|---|---|
| committer | unknown <hf@deer.mysql.r18.ru> | 2003-01-15 13:15:35 +0400 |
| commit | 150a238f033c3e3f8d67dfaa7d1616237738c1cb (patch) | |
| tree | 937beb6f27e5e7958081a4a5ba13ceb2f5251396 /BitKeeper | |
| parent | 09b79b65f225e7e7f66077f95b00e095cf454c3a (diff) | |
| parent | 2d6f1c223d94fe874ac7acba089a1678f314dfac (diff) | |
| download | mariadb-git-150a238f033c3e3f8d67dfaa7d1616237738c1cb.tar.gz | |
resolving conflicts
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysqld/libmysqld.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mini_client.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_error.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/log_event.cc:
Conflicts resolving
sql/log_event.h:
conflicts
sql/mysqld.cc:
conflicts
sql/opt_range.cc:
conflicts
sql/protocol.cc:
conflicts
sql/sql_show.cc:
conflicts
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 00952150b8c..562191618ad 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -26,6 +26,7 @@ hf@bisonxp.(none) hf@deer.mysql.r18.ru hf@genie.(none) jani@dsl-jkl1657.dial.inet.fi +jani@dsl-kpogw4gb5.dial.inet.fi jani@hynda.(none) jani@hynda.mysql.fi jani@janikt.pp.saunalahti.fi @@ -69,7 +70,9 @@ peter@mysql.com ram@gw.udmsearch.izhnet.ru ram@mysql.r18.ru ram@ram.(none) +ranger@regul.home.lan root@x3.internalnet +salle@banica.(none) salle@geopard.(none) salle@geopard.online.bg sasha@mysql.sashanet.com @@ -95,6 +98,7 @@ venu@myvenu.com venu@work.mysql.com vva@eagle.mysql.r18.ru vva@genie.(none) +walrus@kishkin.ru walrus@mysql.com wax@mysql.com worm@altair.is.lan |