Merge sinisa@work.mysql.com:/home/bk/mysql-4.1

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
a336aba9 · unknown · 6449eec1 · 54516f06 · a336aba9 · a336aba9
Commit a336aba9 authored Oct 21, 2002 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1189 additions and 1179 deletions

BitKeeper/etc/gone BitKeeper/etc/gone +1181 -1179

BitKeeper/etc/logging_ok BitKeeper/etc/logging_ok +1 -0

BitKeeper/etc/skipkeys BitKeeper/etc/skipkeys +7 -0

No files found.
--- a/BitKeeper/etc/gone
+++ b/BitKeeper/etc/gone
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -14,6 +14,7 @@ bar@bar.mysql.r18.ru
 bar@bar.udmsearch.izhnet.ru
 bar@gw.udmsearch.izhnet.ru
 bell@sanja.is.com.ua
+bk@admin.bk
 davida@isil.mysql.com
 heikki@donna.mysql.fi
 heikki@hundin.mysql.fi

--- a/BitKeeper/etc/skipkeys
+++ b/BitKeeper/etc/skipkeys
+BK|scripts/safe_mysqld.sh|19700101030959|01930|d0a3cc73fd1b0d8d tim@localhost.polyesthetic.msg|scripts/safe_mysqld.sh|20000802235627|38519
+bk@work.mysql.com|BitKeeper/etc/logging_ok|20000731192914|03271|5e19f6258f804ffe arjen@co3064164-a.bitbike.com|BitKeeper/etc/logging_ok|20011212060636|33009
+bk@work.mysql.com|BitKeeper/etc/logging_ok|20000731192914|03271|5e19f6258f804ffe jcole@tetra.bedford.progress.com|BitKeeper/etc/logging_ok|20001004201211|30554
+bk@work.mysql.com|BitKeeper/etc/logging_ok|20000731192914|03271|5e19f6258f804ffe sasha@work.mysql.com|BitKeeper/etc/logging_ok|20000802223223|24242
+bk@work.mysql.com|BitKeeper/etc/logging_ok|20000731192914|03271|5e19f6258f804ffe tim@localhost.polyesthetic.msg|BitKeeper/etc/logging_ok|20000802235640|27343
+bk@work.mysql.com|ChangeSet|20000731191004|44203|eae70093a6122e66+ sasha@work.mysql.com|ChangeSet|20000802223249|54774
+bk@work.mysql.com|ChangeSet|20000731191004|44203|eae70093a6122e66+ tim@localhost.polyesthetic.msg|ChangeSet|20000802235645|56533