myrg_info.c	merge+insert (v.3)
myrg_extra.c	merge+insert (v.3)
ignore  	cleanup

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

Full fix shall be in MySQL 4.1. (This is a hard one (!))

    removed extra files, adjusted for renames

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

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

ok, here comes the push - prepare to resolve conflicts! And lets hope bk can gracefully handle all of my renames

mrg000001.dummy.result	Rename: mysql-test/r/3.23/mrg000001.dummy.result -> mysql-test/r/mrg000001.dummy.result
mrg000001.result	Rename: mysql-test/r/3.23/mrg000001.result -> mysql-test/r/mrg000001.result
mrg000001.test	Rename: mysql-test/t/3.23/mrg000001.test -> mysql-test/t/mrg000001.test

myrg_info.c	merge+insert (alternate take)
myrg_extra.c	merge+insert (alternate take)
mymrgdef.h	merge+insert (alternate take)
sql_base.cc	open_table --> open_or_reset_table (needed for MERGE)

A lot of new functions for BDB tables
Fix for DROP DATABASE on windows
Default server_id variables

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 tetra.spaceapes.com:/usr/home/jcole/bk/mysql