diff options
| author | unknown <hf@bisonxp.(none)> | 2002-08-03 20:26:44 +0500 |
|---|---|---|
| committer | unknown <hf@bisonxp.(none)> | 2002-08-03 20:26:44 +0500 |
| commit | de566e0a5348ce743a31f51d19b88382dc388a95 (patch) | |
| tree | 830cedeee99989517e44c8d098a400379089044a /BitKeeper | |
| parent | d313a26bb22404dbcd9aebb3c79e97deb4939b56 (diff) | |
| parent | f95ed6093442e53b7ba884a7fcb30ab48ddc1111 (diff) | |
| download | mariadb-git-de566e0a5348ce743a31f51d19b88382dc388a95.tar.gz | |
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into bisonxp.(none):/home/hf/work/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
libmysqld/lib_sql.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 1da3ecc3841..315c0c6d673 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -3,16 +3,20 @@ Administrator@co3064164-a.rochd1.qld.optushome.com.au Administrator@fred. Miguel@light.local Sinisa@sinisa.nasamreza.org +WAX@sergbook.mysql.com ahlentz@co3064164-a.rochd1.qld.optusnet.com.au akishkin@work.mysql.com arjen@co3064164-a.bitbike.com arjen@fred.bitbike.com arjen@george.bitbike.com +bar@bar.udmsearch.izhnet.ru bar@gw.udmsearch.izhnet.ru bell@sanja.is.com.ua davida@isil.mysql.com heikki@donna.mysql.fi heikki@hundin.mysql.fi +hf@bison.(none) +hf@bisonxp.(none) jani@dsl-jkl1657.dial.inet.fi jani@hynda.(none) jani@hynda.mysql.fi @@ -41,10 +45,12 @@ monty@tramp.mysql.fi monty@work.mysql.com mwagner@cash.mwagner.org mwagner@evoq.mwagner.org +nick@mysql.com nick@nick.leippe.com paul@central.snake.net paul@teton.kitebird.com ram@gw.udmsearch.izhnet.ru +ram@ram.(none) root@x3.internalnet sasha@mysql.sashanet.com serg@serg.mysql.com @@ -63,13 +69,9 @@ tonu@hundin.mysql.fi tonu@volk.internalnet tonu@x153.internalnet tonu@x3.internalnet +venu@myvenu.com venu@work.mysql.com +walrus@mysql.com worm@altair.is.lan zak@balfor.local zak@linux.local -venu@myvenu.com -walrus@mysql.com -ram@ram.(none) -WAX@sergbook.mysql.com -bar@bar.udmsearch.izhnet.ru -nick@mysql.com |