diff options
| author | unknown <hf@bison.(none)> | 2002-06-17 17:14:20 +0500 |
|---|---|---|
| committer | unknown <hf@bison.(none)> | 2002-06-17 17:14:20 +0500 |
| commit | 0bf296a02bfb82e8f71c63809f82b2b472fb276a (patch) | |
| tree | 2b5260bdbaeb45cf5cd339349eb23bd4a98199ca /BitKeeper | |
| parent | e19b23821a5f367969eb323ca8bd315f080405d0 (diff) | |
| parent | ea10430d9c77b973edc8ce18caa918e4db6676bf (diff) | |
| download | mariadb-git-0bf296a02bfb82e8f71c63809f82b2b472fb276a.tar.gz | |
Resolving of conflicts from pull
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
include/violite.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
libmysqld/lib_vio.c:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/net_pkg.cc:
Merging of pull conflicts
sql/sql_base.cc:
Merging of pull conflicts
sql/sql_class.h:
Merging of pull conflicts
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 0ed14928cdb..2b3a77e5d3e 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -13,6 +13,7 @@ bell@sanja.is.com.ua davida@isil.mysql.com heikki@donna.mysql.fi heikki@hundin.mysql.fi +hf@bison.(none) jani@dsl-jkl1657.dial.inet.fi jani@hynda.(none) jani@hynda.mysql.fi @@ -63,8 +64,8 @@ tonu@hundin.mysql.fi tonu@volk.internalnet tonu@x153.internalnet tonu@x3.internalnet +venu@myvenu.com venu@work.mysql.com worm@altair.is.lan zak@balfor.local zak@linux.local -venu@myvenu.com |