into  ppcg5.local:/Users/antony/Work/p2-bug25800.6.merge

into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines

  Problem: crash on attempt to open a table
  having "#mysql50#" prefix in db or table name.
  Fix: This prefix is reserved for "mysql_upgrade"
  to access 5.0 tables  whose file names are not encoded
  according to "5.1 tablename to filename encoded".
  Don't try open tables whose db name or table name
  has this prefix.

into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines

            SHOW CREATE TABLE fails
Addition to the fix: report db name + table name instead of table path.
This solves embedded merge test failure.

  "Embedded server requires mysql.plugin"
  Embedded builds should not print any error when the mysql.plugin
  table does not exist. This is achieved by checking for the existance
  of the mysql.plugin table before attempting to open it and proceed
  silently if it does not exist.

            SHOW CREATE TABLE fails

After merge fixes.

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M50/push-5.0

into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines

into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines

into  xiphis.org:/home/antony/work2/mysql-5.1-merge

into  xiphis.org:/home/antony/work2/mysql-5.0-merge

into  xiphis.org:/home/antony/work2/mysql-5.0-engines.merge

into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge

into  xiphis.org:/home/antony/work2/mysql-4.1-engines.merge

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M51/push-5.1

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41

into  trift2.:/MySQL/M51/push-5.1

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M41/push-4.1

into  trift2.:/MySQL/M50/push-5.0

  Add another exception to the acceptable mysqld errors, for test case for bug 28436

            SHOW CREATE TABLE fails

Underlying table names, that merge engine fails to open were not
reported.

With this fix CHECK TABLE issued against merge table reports all
underlying table names that it fails to open. Other statements
are unaffected, that is underlying table names are not included
into error message.

This fix doesn't solve SHOW CREATE TABLE issue.

  Post-merge fix warning

  Post-merge fix (byte -> uchar)

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50

into  chilla.local:/home/mydev/mysql-5.1-axmrg

into  chilla.local:/home/mydev/mysql-5.1-axmrg

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb