diff options
| author | unknown <lars@mysql.com> | 2005-05-06 15:04:07 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-05-06 15:04:07 +0200 |
| commit | 5bb91691185c247d48162d9122392c717fd5388c (patch) | |
| tree | ef9546f0afeb86bd67e50136f11b58333394ae08 /BitKeeper/etc/logging_ok | |
| parent | 303229750d5f717a3174f34ba056482951a8a0a2 (diff) | |
| parent | 0baed276c312dd2e277e0e029f290510c6bdd4d9 (diff) | |
| download | mariadb-git-5bb91691185c247d48162d9122392c717fd5388c.tar.gz | |
Manual merge 5.0->5.1
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/innobase/include/lock0lock.h:
Auto merged
storage/innobase/include/srv0srv.h:
Auto merged
storage/innobase/lock/lock0lock.c:
Auto merged
storage/innobase/srv/srv0srv.c:
Auto merged
storage/ndb/test/src/NDBT_ResultRow.cpp:
Auto merged
sql/slave.cc:
Due to refactoring, this needs to be checked before the call.
sql/sql_acl.cc:
Resolving conflicts due to bug fix and filter refactoring
Diffstat (limited to 'BitKeeper/etc/logging_ok')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 75ccef73ee3..d73f511031d 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -82,6 +82,7 @@ hf@bisonxp.(none) hf@deer.(none) hf@deer.mysql.r18.ru hf@genie.(none) +holyfoot@mysql.com igor@hundin.mysql.fi igor@linux.local igor@rurik.mysql.com @@ -96,6 +97,7 @@ jani@dsl-jkl1657.dial.inet.fi jani@dsl-kpogw4gb5.dial.inet.fi jani@hynda.(none) jani@hynda.mysql.fi +jani@ibmlab.site jani@janikt.pp.saunalahti.fi jani@linux.local jani@rhols221.adsl.netsonic.fi @@ -186,6 +188,7 @@ mysqldev@build.mysql2.com mysqldev@melody.local mysqldev@mysql.com mysqldev@o2k.irixworld.net +ndbdev@dl145b.mysql.com ndbdev@eel.hemma.oreland.se ndbdev@ndbmaster.mysql.com ndbdev@shark. @@ -219,6 +222,7 @@ ram@deer.(none) ram@gw.mysql.r18.ru ram@gw.udmsearch.izhnet.ru ram@mysql.r18.ru +ram@ram-book.(none) ram@ram.(none) ramil@mysql.com ranger@regul.home.lan @@ -242,6 +246,7 @@ serg@serg.mysql.com serg@sergbook.mylan serg@sergbook.mysql.com sergefp@mysql.com +shuichi@mysql.com sinisa@rhols221.adsl.netsonic.fi stewart@mysql.com svoj@mysql.com |