diff options
| author | unknown <serg@sergbook.mysql.com> | 2002-05-26 12:59:02 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2002-05-26 12:59:02 +0200 |
| commit | af68d3de879a94b2be47ed5e335d5c072692ea2b (patch) | |
| tree | 5f3fb370d149674a5938f85690eda1c1816dc456 /BitKeeper | |
| parent | 5abc01a898154d9d34bdaabb141d8c3b4b32cf4e (diff) | |
| parent | 85bfbcd7adb594a6cf4704a5f0ff68affd22d349 (diff) | |
| download | mariadb-git-af68d3de879a94b2be47ed5e335d5c072692ea2b.tar.gz | |
Merge work:/home/bk/mysql
into sergbook.mysql.com:/usr/home/serg/Abk/mysql
BitKeeper/etc/logging_ok:
auto-union
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index d8728321e34..e9190b7e75d 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,23 +1,24 @@ Miguel@light.local +Sinisa@sinisa.nasamreza.org +arjen@fred.bitbike.com heikki@donna.mysql.fi +heikki@hundin.mysql.fi +jani@hynda.mysql.fi jorge@linux.jorge.mysql.com +lenz@mysql.com +miguel@hegel.local miguel@light.local monty@bitch.mysql.fi monty@donna.mysql.fi monty@hundin.mysql.fi +monty@tik. monty@tik.mysql.fi monty@work.mysql.com mwagner@cash.mwagner.org +nick@nick.leippe.com paul@central.snake.net sasha@mysql.sashanet.com serg@serg.mysql.com -heikki@hundin.mysql.fi -jani@hynda.mysql.fi -miguel@hegel.local -arjen@fred.bitbike.com +serg@sergbook.mysql.com sinisa@rhols221.adsl.netsonic.fi -Sinisa@sinisa.nasamreza.org -nick@nick.leippe.com -monty@tik. zak@balfor.local -lenz@mysql.com |