diff options
| author | unknown <hf@genie.(none)> | 2002-11-29 12:35:48 +0400 |
|---|---|---|
| committer | unknown <hf@genie.(none)> | 2002-11-29 12:35:48 +0400 |
| commit | 4c668ca7ef27d3292342d6c34460a74cdb4d7098 (patch) | |
| tree | 7aa1227117cb2c279c639fbe58eeace841422330 /BitKeeper | |
| parent | 781a5bc81ad3fdd6111986a895e6025d6910773e (diff) | |
| parent | 36140ba7c5c44e62242fdadaa77da7fc555b400c (diff) | |
| download | mariadb-git-4c668ca7ef27d3292342d6c34460a74cdb4d7098.tar.gz | |
Pull conflicts resolutions
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/mysqltest.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
libmysqld/libmysqld.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
include/mysql.h:
Pull conflicts resolved
include/violite.h:
Pull conflicts resolved
sql/item.cc:
Pull conflicts resolved
sql/item.h:
Pull conflicts recolved
sql/item_strfunc.cc:
Pull conflicts resolved
sql/mysql_priv.h:
Pull conflicts resolved
sql/sql_parse.cc:
Pull conflicts resolved
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index c424926a248..2d1e2991d32 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -21,6 +21,8 @@ heikki@donna.mysql.fi heikki@hundin.mysql.fi heikki@rescue. heikki@work.mysql.com +hf@bison.(none) +hf@bisonxp.(none) hf@genie.(none) jani@dsl-jkl1657.dial.inet.fi jani@hynda.(none) |