bzr push into mysql-6.0-bugteam tree (mleich:2762 to 2762) Bug#12093, Bug#37853

[Matthias Leich]

------------------------------------------------------------
revno: 2762
revision-id: mleich@stripped
parent: mattiasj@stripped
parent: mleich@stripped
committer: Matthias Leich <mleich@stripped>
branch nick: mysql-6.0-bugteam-push
timestamp: Wed 2008-08-13 22:05:34 +0200
message:
  Upmerge 5.1 -> 6.0
added:
  mysql-test/include/ps_ddl_1.inc ps_ddl_1.inc-20080813193914-5m34walobgzv0okx-1
modified:
  mysql-test/r/ps_ddl.result    
sp1f-ps_ddl.result-20071215004622-7wxecn5bjzrz7scbog54tuaaobpayisn
  mysql-test/suite/funcs_1/datadict/processlist_val.inc
sp1f-processlist_val.inc-20070815194641-3hfsmyh3jr2gjhvgms52iydpkamdbnoz
  mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
sp1f-a_processlist_val_no-20070815194641-puz2vi6caqirb4nqzumushorqyuniraq
  mysql-test/suite/funcs_1/r/processlist_val_ps.result
sp1f-b_processlist_val_ps-20070815194641-kl4wj4y6bete5txk6xnyppp2h5atsodw
  mysql-test/t/ps_ddl.test      
sp1f-ps_ddl.test-20071215004622-2fkvss6xi7zvoksbhhmbwak3gs54jnbo
    ------------------------------------------------------------
    revno: 2497.374.2
    revision-id: mleich@stripped
    parent: mleich@stripped
    committer: Matthias Leich <mleich@stripped>
    branch nick: mysql-5.1-bugteam-push
    timestamp: Wed 2008-08-13 21:44:54 +0200
    message:
      Fix for Bug#37853
          Test "funcs_1.processlist_val_ps" fails in various ways
      + corrections of logic in poll routines
      + minor improvements
    modified:
      mysql-test/suite/funcs_1/datadict/processlist_val.inc
sp1f-processlist_val.inc-20070815194641-3hfsmyh3jr2gjhvgms52iydpkamdbnoz
      mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
sp1f-a_processlist_val_no-20070815194641-puz2vi6caqirb4nqzumushorqyuniraq
      mysql-test/suite/funcs_1/r/processlist_val_ps.result
sp1f-b_processlist_val_ps-20070815194641-kl4wj4y6bete5txk6xnyppp2h5atsodw
    ------------------------------------------------------------
    revno: 2497.374.1
    revision-id: mleich@stripped
    parent: mattiasj@stripped
    committer: Matthias Leich <mleich@stripped>
    branch nick: mysql-5.1-bugteam-push
    timestamp: Wed 2008-08-13 21:42:21 +0200
    message:
      Improve the testcases for Bug 12093 in ps_ddl.test
      Details:
      - add subtest with drop unrelated view
      - rearrange existing tests so that a distinction
        between drop procedure and drop function effects
        is possible
    added:
      mysql-test/include/ps_ddl_1.inc ps_ddl_1.inc-20080813193914-5m34walobgzv0okx-1
    modified:
      mysql-test/r/ps_ddl.result    
sp1f-ps_ddl.result-20071215004622-7wxecn5bjzrz7scbog54tuaaobpayisn
      mysql-test/t/ps_ddl.test      
sp1f-ps_ddl.test-20071215004622-2fkvss6xi7zvoksbhhmbwak3gs54jnbo

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