diff options
author | unknown <monty@hundin.mysql.fi> | 2002-02-14 18:58:24 +0200 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-02-14 18:58:24 +0200 |
commit | 5fa6df3081eea58dbd21e24315e27d166e66d23c (patch) | |
tree | 9f6476af645cdeb53eefe6ca4f6bc6f4ac04bf84 /BitKeeper | |
parent | 7bff1b0c345c6d8f334bd31f693fb9cbe69ea120 (diff) | |
parent | 3a231663f034394fe341ebc98fa335f824fa3135 (diff) | |
download | mariadb-git-5fa6df3081eea58dbd21e24315e27d166e66d23c.tar.gz |
merge with 3.23.49
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
Docs/manual.texi:
Auto merged
client/client_priv.h:
Auto merged
include/mysql.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
mysql-test/t/comments.test:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/unireg.cc:
Auto merged
sql/unireg.h:
Auto merged
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 75f06d03cb1..fc2cbd97a56 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -8,6 +8,7 @@ arjen@co3064164-a.bitbike.com bell@sanja.is.com.ua davida@isil.mysql.com heikki@donna.mysql.fi +heikki@hundin.mysql.fi jani@hynda.mysql.fi jani@janikt.pp.saunalahti.fi jani@rhols221.adsl.netsonic.fi @@ -15,6 +16,7 @@ jcole@abel.spaceapes.com jcole@main.burghcom.com jcole@sarvik.tfr.cafe.ee jcole@tetra.spaceapes.com +jorge@linux.jorge.mysql.com kaj@work.mysql.com miguel@light.local monty@bitch.mysql.fi |