bzr commit into mysql-6.0 tree (mleich:2798) Bug#26687, Bug#38270

[Matthias Leich]

#At file:///work2/6.0/mysql-6.0-bugteam-1/

------------------------------------------------------------
revno: 2798
revision-id: mleich@stripped
parent: holyfoot@stripped
parent: mleich@stripped
committer: Matthias Leich <mleich@stripped>
branch nick: mysql-6.0-bugteam-1
timestamp: Mo 2008-08-25 17:03:24 +0200
message:
  Upmerge of bug fixes from 5.1 -> 6.0
  - Remove ps_ddl from disabled.def
  - Update ps_ddl.result
modified:
  mysql-test/extra/rpl_tests/rpl_ddl.test sp1f-rpl_ddl.test-20050527021727-k23dlmkp4srobzphm5z2lr46irrstrpr
  mysql-test/suite/funcs_1/datadict/processlist_priv.inc sp1f-processlist_priv.inc-20070815194641-da67ub26jjvt6hw6xorwk7twwxj6wofg
  mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result sp1f-a_processlist_priv_n-20070815194641-dlvb2zym4djihvxmbsmib5bvpgytiuoe
  mysql-test/suite/funcs_1/r/processlist_priv_ps.result sp1f-b_processlist_priv_p-20070815194641-wvgg7pf5qwl5hwxe5rmd2lefnwfiaz7e
  mysql-test/suite/rpl/r/rpl_ddl.result sp1f-rpl_ddl.result-20050527021727-cqk4fr2yc7ip4tokimt52ni4x65jgtnw
  mysql-test/suite/rpl/t/disabled.def sp1f-disabled.def-20070627122758-vdqevwzhnizicdrxrmfy4w4afgprx46x
    ------------------------------------------------------------
    revno: 2497.388.6
    revision-id: mleich@stripped
    parent: mleich@stripped
    parent: mleich@stripped
    committer: Matthias Leich <mleich@stripped>
    branch nick: mysql-5.1-bugteam-1
    timestamp: Mo 2008-08-25 15:23:11 +0200
    message:
      Merge of fix for
      Bug#38270 Test "processlist_priv_ps" fails on
                varying "processlist" output
    modified:
      mysql-test/suite/funcs_1/datadict/processlist_priv.inc sp1f-processlist_priv.inc-20070815194641-da67ub26jjvt6hw6xorwk7twwxj6wofg
      mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result sp1f-a_processlist_priv_n-20070815194641-dlvb2zym4djihvxmbsmib5bvpgytiuoe
      mysql-test/suite/funcs_1/r/processlist_priv_ps.result sp1f-b_processlist_priv_p-20070815194641-wvgg7pf5qwl5hwxe5rmd2lefnwfiaz7e
        ------------------------------------------------------------
        revno: 2497.389.1
        revision-id: mleich@stripped
        parent: gluh@stripped
        committer: Matthias Leich <mleich@stripped>
        branch nick: mysql-5.1-bugteam-push
        timestamp: Do 2008-08-21 16:38:49 +0200
        message:
          Fix for Bug#38270 Test "processlist_priv_ps" fails on varying "processlist" output
          Details of the fix:
          - wrong command and state in processlist -> insert poll routine
          - unexpected additional session -> abort if unexpected session found
        modified:
          mysql-test/suite/funcs_1/datadict/processlist_priv.inc sp1f-processlist_priv.inc-20070815194641-da67ub26jjvt6hw6xorwk7twwxj6wofg
          mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result sp1f-a_processlist_priv_n-20070815194641-dlvb2zym4djihvxmbsmib5bvpgytiuoe
          mysql-test/suite/funcs_1/r/processlist_priv_ps.result sp1f-b_processlist_priv_p-20070815194641-wvgg7pf5qwl5hwxe5rmd2lefnwfiaz7e
    ------------------------------------------------------------
    revno: 2497.388.5
    revision-id: mleich@stripped
    parent: holyfoot@stripped
    parent: mleich@stripped
    committer: Matthias Leich <mleich@stripped>
    branch nick: mysql-5.1-bugteam-1
    timestamp: Mo 2008-08-25 15:09: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.3773.1
    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-2798.diff