diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-03 22:28:16 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-03 22:28:16 +0200 |
| commit | 29bae7b7b7c2aec02fe5789f3fc6a0fb918c0814 (patch) | |
| tree | 0a2390d862862624034715894ef105522aed276b /BitKeeper | |
| parent | 36a4cc178fc574dd9996c620eca609fe456d8c58 (diff) | |
| parent | 8b91ed2c39add003ebc56d520c902fd092f1f741 (diff) | |
| download | mariadb-git-29bae7b7b7c2aec02fe5789f3fc6a0fb918c0814.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
acinclude.m4:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
Docs/manual.texi:
Bad merge.
include/mysqld_error.h:
Merge with 3.23
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 0b6312b0445..2dd5daa4999 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,6 +1,10 @@ +Administrator@co3064164-a. +Administrator@co3064164-a.rochd1.qld.optushome.com.au Administrator@fred. Miguel@light.local Sinisa@sinisa.nasamreza.org +ahlentz@co3064164-a.rochd1.qld.optusnet.com.au +arjen@co3064164-a.bitbike.com davida@isil.mysql.com heikki@donna.mysql.fi jani@hynda.mysql.fi @@ -13,6 +17,7 @@ monty@bitch.mysql.fi monty@donna.mysql.fi monty@hundin.mysql.fi monty@tik.mysql.fi +monty@tramp.mysql.fi monty@work.mysql.com mwagner@evoq.mwagner.org paul@central.snake.net @@ -31,7 +36,3 @@ tonu@hundin.mysql.fi tonu@volk.internalnet tonu@x153.internalnet tonu@x3.internalnet -Administrator@co3064164-a. -Administrator@co3064164-a.rochd1.qld.optushome.com.au -ahlentz@co3064164-a.rochd1.qld.optusnet.com.au -arjen@co3064164-a.bitbike.com |