myrg_info.c	merge + insert OK
mymrgdef.h	merge + insert OK
mrg000001.test  test for the above
mysql-test-run	compatibility (FreeBSD) changes from mysql-4.0 backpropagated

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

Fix for creating read-only files on windows
Manual updates

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

    updates for temporary table replication, and docs for replicate-do/ignore-table
    updated change history
    fixed errors/warnings from makeinfo

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

fixed slave to preserve temp tables on slave stop; slave start
added abort-slave-event-count option to mysqld to test the above
added a test case for temp tables with a contantly aborting slave
removed warning in sql_parse.cc
fixed thimble.cc to compile

into nslinuxw2.bedford.progress.com:/users/devp/yfaktoro/bk/local

into nslinuxw2.bedford.progress.com:/users/devp/yfaktoro/bk/local

into threads.polyesthetic.msg:/usr/local/src/my/work

handles running several mysqlds on one host easily.  Original
multi-server modifications made by Tim Bunce.

tools.