diff options
| author | unknown <monty@narttu.mysql.fi> | 2002-08-05 22:18:39 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2002-08-05 22:18:39 +0300 |
| commit | 3cf7c3e68bae80f753196e8bb38d8cced9adb324 (patch) | |
| tree | 49e4d4daefba1e0a52502e97ecda432875546fb3 /BitKeeper | |
| parent | 529e1af2957828c4b8570933547b7202c8a36878 (diff) | |
| parent | ccf728776349a95fbeaeac58a825949040f20a55 (diff) | |
| download | mariadb-git-3cf7c3e68bae80f753196e8bb38d8cced9adb324.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
sql/sql_base.cc:
Auto merged
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 2eaef09868f..a1f78d25f92 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,6 +1,7 @@ Miguel@light.local Sinisa@sinisa.nasamreza.org arjen@fred.bitbike.com +bar@bar.udmsearch.izhnet.ru heikki@donna.mysql.fi heikki@hundin.mysql.fi jani@hynda.mysql.fi @@ -11,18 +12,18 @@ miguel@light.local monty@bitch.mysql.fi monty@donna.mysql.fi monty@hundin.mysql.fi +monty@mashka.mysql.fi +monty@narttu. +monty@narttu.mysql.fi monty@tik. monty@tik.mysql.fi monty@work.mysql.com mwagner@cash.mwagner.org nick@nick.leippe.com paul@central.snake.net +salle@geopard.online.bg sasha@mysql.sashanet.com serg@serg.mysql.com serg@sergbook.mysql.com sinisa@rhols221.adsl.netsonic.fi zak@balfor.local -monty@narttu. -monty@mashka.mysql.fi -bar@bar.udmsearch.izhnet.ru -salle@geopard.online.bg |