diff options
| author | unknown <monty@mysql.com> | 2004-09-09 07:26:28 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-09-09 07:26:28 +0300 |
| commit | e18b7ea95942cb8ab0b31d453929dde50dcf3756 (patch) | |
| tree | e2b882265e31ada44f3adec357920530f0c0ac31 /BitKeeper | |
| parent | c92b5349701ba68fa7ab97abf14933de8d6352fe (diff) | |
| parent | 33efc9677d6f6a68d3dba69f4c036856ac4af5fe (diff) | |
| download | mariadb-git-e18b7ea95942cb8ab0b31d453929dde50dcf3756.tar.gz | |
Merge on pull
BitKeeper/etc/logging_ok:
auto-union
include/my_sys.h:
Auto merged
mysql-test/r/func_in.result:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index b850584df5b..f29057f1d38 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -62,6 +62,7 @@ hf@genie.(none) igor@hundin.mysql.fi igor@rurik.mysql.com ingo@mysql.com +jan@hundin.mysql.fi jani@a80-186-24-72.elisa-laajakaista.fi jani@dsl-jkl1657.dial.inet.fi jani@dsl-kpogw4gb5.dial.inet.fi @@ -81,10 +82,12 @@ jcole@mugatu.jcole.us jcole@mugatu.spaceapes.com jcole@sarvik.tfr.cafe.ee jcole@tetra.spaceapes.com +joerg@mysql.com joreland@mysql.com jorge@linux.jorge.mysql.com jplindst@t41.(none) kaj@work.mysql.com +kent@mysql.com konstantin@mysql.com kostja@oak.local lenz@kallisto.mysql.com @@ -95,9 +98,11 @@ miguel@hegel.(none) miguel@hegel.br miguel@hegel.local miguel@hegel.txg +miguel@hegel.txg.br miguel@light. miguel@light.local miguel@sartre.local +mikron@c-fb0ae253.1238-1-64736c10.cust.bredbandsbolaget.se mikron@mikael-ronstr-ms-dator.local mmatthew@markslaptop. monty@bitch.mysql.fi @@ -128,6 +133,8 @@ mysql@home.(none) mysqldev@build.mysql2.com mysqldev@melody.local mysqldev@mysql.com +mysqldev@o2k.irixworld.net +ndbdev@eel.hemma.oreland.se ndbdev@ndbmaster.mysql.com nick@mysql.com nick@nick.leippe.com @@ -154,6 +161,7 @@ ram@gw.udmsearch.izhnet.ru ram@mysql.r18.ru ram@ram.(none) ranger@regul.home.lan +rburnett@build.mysql.com root@home.(none) root@x3.internalnet salle@banica.(none) |