bzr commit into mysql-5.1 tree (mleich:2718) Bug#26687

[Matthias Leich]

#At file:///work2/5.1/mysql-5.1-bugteam-funcs_1/

------------------------------------------------------------
revno: 2718
revision-id: mleich@stripped
parent: gluh@stripped
parent: mleich@stripped
committer: Matthias Leich <mleich@stripped>
branch nick: mysql-5.1-bugteam-funcs_1
timestamp: Mo 2008-08-25 14:20:51 +0200
message:
  Upmerge 5.0 -> 5.1 of fix for
  Bug#26687 rpl_ddl test fails if run with --innodb option
modified:
  mysql-test/extra/rpl_tests/rpl_ddl.test
sp1f-rpl_ddl.test-20050527021727-k23dlmkp4srobzphm5z2lr46irrstrpr
    ------------------------------------------------------------
    revno: 1810.3760.7
    revision-id: mleich@stripped
    parent: gluh@stripped
    committer: Matthias Leich <mleich@stripped>
    branch nick: mysql-5.0-bugteam-funcs_1
    timestamp: Fr 2008-08-22 19:49:51 +0200
    message:
      Fix for
        Bug#26687 rpl_ddl test fails if run with --innodb option
        Details:
        - The current test + the expected results do only fit
          if the slave uses MyISAM for mysqltest1.t1.
          Therefore skip the test if we do not meet these
          conditions.
        - The solution for 5.1 will look quite different
          because "ps_ddl" is already much improved in
          MySQL 5.1.
    modified:
      mysql-test/t/rpl_ddl.test     
sp1f-rpl_ddl.test-20050527021727-k23dlmkp4srobzphm5z2lr46irrstrpr

Attachment: [text/text/x-diff] patch-2718.diff