bzr push into mysql-6.0 tree (Matthias.Leich:2819 to 2819)

[Matthias Leich]

------------------------------------------------------------
revno: 2819
revision-id: matthias.leich@stripped
parent: matthias.leich@stripped
parent: matthias.leich@stripped
committer: Matthias Leich <Matthias.Leich@stripped>
branch nick: mysql-6.0-bugteam-push
timestamp: Thu 2008-09-18 16:16:07 +0200
message:
  Merge 5.1 -> 6.0
  no conflicts, no real changes
    ------------------------------------------------------------
    revno: 2497.419.5
    revision-id: matthias.leich@stripped
    parent: matthias.leich@stripped
    parent: matthias.leich@stripped
    committer: Matthias Leich <Matthias.Leich@stripped>
    branch nick: mysql-5.1-bugteam-push
    timestamp: Thu 2008-09-18 15:46:27 +0200
    message:
      Merge 5.0 -> 5.1
      no conflicts, no real code changes
        ------------------------------------------------------------
        revno: 1810.3778.11
        revision-id: matthias.leich@stripped
        parent: matthias.leich@stripped
        parent: azundris@stripped
        committer: Matthias Leich <Matthias.Leich@stripped>
        branch nick: mysql-5.0-bugteam-push
        timestamp: Thu 2008-09-18 15:32:06 +0200
        message:
          Merge actual tree -> local tree
          no conflicts
        modified:
          mysql-test/r/loaddata.result  
sp1f-loaddata.result-20030505115238-y53yqooyomv7c43r2heznierboaww576
          mysql-test/t/loaddata.test    
sp1f-loaddata.test-20030505115238-2kz3yrlkdadbbcxdc3cncvt7ofzo2ln5
          sql/sql_class.cc              
sp1f-sql_class.cc-19700101030959-rpotnweaff2pikkozh3butrf7mv3oero
          sql/sql_class.h               
sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s
          sql/sql_load.cc               
sp1f-sql_load.cc-19700101030959-hoqlay5we4yslrw23xqedulkejw6a3o5
    ------------------------------------------------------------
    revno: 2497.419.4
    revision-id: matthias.leich@stripped
    parent: matthias.leich@stripped
    parent: azundris@stripped
    committer: Matthias Leich <Matthias.Leich@stripped>
    branch nick: mysql-5.1-bugteam-push
    timestamp: Thu 2008-09-18 15:05:19 +0200
    message:
      Merge actual bugteam tree -> local tree
    added:
      mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result
mysqltestsuitebinlog-20080908201825-i6zylwbc64c5pb8p-1
      mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test
mysqltestsuitebinlog-20080908201825-i6zylwbc64c5pb8p-2
    modified:
      mysql-test/extra/binlog_tests/innodb_stat.test
sp1f-innodb_stat.test-20051222053450-nkj6khpta7xrj2axzcb3l4rfgvgqfrp2
      mysql-test/r/loaddata.result  
sp1f-loaddata.result-20030505115238-y53yqooyomv7c43r2heznierboaww576
      mysql-test/suite/binlog/r/binlog_row_innodb_stat.result
sp1f-binlog_row_innodb_st-20051222053451-i5jdnhcf4ikw2cb2xbvbha7zwh5iwfyn
      mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result
sp1f-binlog_stm_innodb_st-20051222053451-s2jxwdb3tbz6lg6qvsf5vjycdq6tvj5x
      mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test
sp1f-binlog_stm_innodb_st-20051222053459-o3cq2o7wz4qp6ncicmvfqz3kjqfe4eab
      mysql-test/t/loaddata.test    
sp1f-loaddata.test-20030505115238-2kz3yrlkdadbbcxdc3cncvt7ofzo2ln5
      sql/sql_class.cc              
sp1f-sql_class.cc-19700101030959-rpotnweaff2pikkozh3butrf7mv3oero
      sql/sql_class.h               
sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s
      sql/sql_load.cc               
sp1f-sql_load.cc-19700101030959-hoqlay5we4yslrw23xqedulkejw6a3o5
    ------------------------------------------------------------
    revno: 2497.420.4
    revision-id: azundris@stripped
    parent: azundris@stripped
    parent: chad@stripped
    committer: Tatiana A. Nurnberg <azundris@stripped>
    branch nick: 51-37114
    timestamp: Thu 2008-09-18 13:15:19 +0200
    message:
      auto-merge
    added:
      mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result
mysqltestsuitebinlog-20080908201825-i6zylwbc64c5pb8p-1
      mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test
mysqltestsuitebinlog-20080908201825-i6zylwbc64c5pb8p-2
    modified:
      mysql-test/extra/binlog_tests/innodb_stat.test
sp1f-innodb_stat.test-20051222053450-nkj6khpta7xrj2axzcb3l4rfgvgqfrp2
      mysql-test/suite/binlog/r/binlog_row_innodb_stat.result
sp1f-binlog_row_innodb_st-20051222053451-i5jdnhcf4ikw2cb2xbvbha7zwh5iwfyn
      mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result
sp1f-binlog_stm_innodb_st-20051222053451-s2jxwdb3tbz6lg6qvsf5vjycdq6tvj5x
      mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test
sp1f-binlog_stm_innodb_st-20051222053459-o3cq2o7wz4qp6ncicmvfqz3kjqfe4eab

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