typo/bad merge fixed
chmod a-x for man/*.1 files

log0log.c	Change Innobase text to InnoDB
srv0start.c	Change Innobase text to InnoDB
srv0srv.c	Change Innobase text to InnoDB
ha_innobase.cc	Change Innobase text to InnoDB

Deleted a lot of old benchmark runs

    do REAL_EMAIL magic
mysql-test/mysql-test-run.sh
    added show_failed_diffs
mysql-test/r/bench_count_distinct.result
    tired of waiting :-)
mysql-test/r/rpl000001.result
    new test results after implementing Monty's Hack (TM)
mysql-test/t/bench_count_distinct.test
    tired of waiting
mysql-test/t/rpl000001.test
    implemented Monty's Hack (TM) to kill a query in the middle of update
    without generating a table with 30,000 rows. This will also avoice the
    timing uncertainty

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0

    use REAL_EMAIL
myisam/mi_search.c
    merged the dropped lines
ignore junk in libmysqld directory

    reversed incorrect temporary change

start slave thread if master.info is present and server_id is set
updates for rpl000015 and rpl000016 to remove master.info to make sure
master info struct does not get auto-initialized

PSTACK, libmysqld and MySQL filesystem
UPDATE ... ORDER BY
DELETE ... ORDER BY
New faster fulltext handling
Faster compressed keys

into mysql.sashanet.com:/home/sasha/src/bk/mysql

mark killed partially completed updates with an error code in binlog
stop replication if the master reports a possible partial/killed update
test partially killed update

os0thread.c	Set created thread priority to QUERY_PRIOR if specified
row0mysql.c	Drop table removes locks on the table, error handling changed
row0ins.c	Insert now always sets a shared lock on a duplicate or suspected duplicate record
lock0lock.h	Can remove locks from a table to be dropped
lock0lock.c	Can remove locks from a table to be dropped
srv0srv.c	Try to do log flush every second
srv0start.c	No need for a slash at the end of dir
trx0trx.h	Added an IGNORE option field to trx handle
trx0trx.c	Added an IGNORE option field to trx handle
ha_innobase.h	Added last_query_id field to handle
ha_innobase.cc	Fix drop table hang, roll-forward etc.

into mysql.sashanet.com:/home/sasha/src/bk/mysql

    make table delay key write to speed things up a bit

added a benchmark test for count(distinct)

ignore generated files from bdb

Fix for shutdown on NT
Fixed bug when using wrong dates from blob field.