Speed up column-completion in 'mysql'
Don't use ISAM if HAVE_ISAM is not defined
A lot of fixes for the embedded version. All libraries are now included in libmysqld.a
Changed arguments to convert_dirname() to make it more general.
Renamed files in the 'merge' directory to all use a common prefix.
Don't compile both assembler and C functions on x86
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