diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-01-30 16:37:47 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-01-30 16:37:47 +0200 |
| commit | 85278245af45fc301dc7940bec9a3434003285a6 (patch) | |
| tree | 3ca7f6fddbb9bdc0b635f243af69c6606924c3c2 /BitKeeper | |
| parent | 9369764f2226e0e8cb9724bcdac256f45330ba67 (diff) | |
| parent | 8a56717c4ce14aa7e36e04a8dc880dcc1311ea28 (diff) | |
| download | mariadb-git-85278245af45fc301dc7940bec9a3434003285a6.tar.gz | |
Merge from 3.23.48 tree
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/mem/mem0dbg.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/rem/rem0rec.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/trx/trx0undo.c:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/t/join.test:
Auto merged
mysys/hash.c:
Auto merged
scripts/mysql_config.sh:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 4986ccbba58..75f06d03cb1 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -5,13 +5,17 @@ Miguel@light.local Sinisa@sinisa.nasamreza.org ahlentz@co3064164-a.rochd1.qld.optusnet.com.au arjen@co3064164-a.bitbike.com +bell@sanja.is.com.ua davida@isil.mysql.com heikki@donna.mysql.fi jani@hynda.mysql.fi jani@janikt.pp.saunalahti.fi +jani@rhols221.adsl.netsonic.fi jcole@abel.spaceapes.com jcole@main.burghcom.com +jcole@sarvik.tfr.cafe.ee jcole@tetra.spaceapes.com +kaj@work.mysql.com miguel@light.local monty@bitch.mysql.fi monty@donna.mysql.fi @@ -19,6 +23,7 @@ monty@hundin.mysql.fi monty@tik.mysql.fi monty@tramp.mysql.fi monty@work.mysql.com +mwagner@cash.mwagner.org mwagner@evoq.mwagner.org paul@central.snake.net paul@teton.kitebird.com @@ -32,14 +37,9 @@ tim@hundin.mysql.fi tim@threads.polyesthetic.msg tim@white.box tim@work.mysql.com +tom@basil-firewall.home.com tonu@hundin.mysql.fi tonu@volk.internalnet tonu@x153.internalnet tonu@x3.internalnet -jcole@sarvik.tfr.cafe.ee venu@work.mysql.com -bell@sanja.is.com.ua -kaj@work.mysql.com -mwagner@cash.mwagner.org -tom@basil-firewall.home.com -jani@rhols221.adsl.netsonic.fi |