Docs/manual.texi:
  Clearify when logging is done
myisam/myisamchk.c:
  Better error message
mysql-test/r/merge.result:
  Added test for SHOW CREATE on MERGE table
scripts/safe_mysqld.sh:
  Search by default in database directory
sql/ha_myisammrg.h:
  Add UNION() to SHOW CREATE TABLE
sql/sql_update.cc:
  removed compiler warning