List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:December 21 2012 10:54am
Subject:bzr push into mysql-trunk branch (andrei.elkin:5293 to 5294)
View as plain text  
 5294 Andrei Elkin	2012-12-21 [merge]
      merge from 5.6 bugfixing branch.

    removed:
      mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result
      mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test
      mysql-test/suite/rpl/t/rpl_stm_mts_rec_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_stm_mts_rec_crash_safe.test
    added:
      mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_small.result
      mysql-test/suite/rpl/t/rpl_stm_mixed_mts_rec_crash_safe_small-slave.opt
      mysql-test/suite/rpl/t/rpl_stm_mixed_mts_rec_crash_safe_small.test
    renamed:
      mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result => mysql-test/suite/rpl/r/rpl_stm_mixed_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result => mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result => mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_checksum.result
      mysql-test/suite/rpl/t/rpl_mixed_mts_crash_safe-slave.opt => mysql-test/suite/rpl/t/rpl_stm_mixed_mts_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_mixed_mts_crash_safe.test => mysql-test/suite/rpl/t/rpl_stm_mixed_mts_crash_safe.test
      mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe-slave.opt => mysql-test/suite/rpl/t/rpl_stm_mixed_mts_rec_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe.test => mysql-test/suite/rpl/t/rpl_stm_mixed_mts_rec_crash_safe.test
      mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum-master.opt => mysql-test/suite/rpl/t/rpl_stm_mixed_mts_rec_crash_safe_checksum-master.opt
      mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum-slave.opt => mysql-test/suite/rpl/t/rpl_stm_mixed_mts_rec_crash_safe_checksum-slave.opt
      mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum.test => mysql-test/suite/rpl/t/rpl_stm_mixed_mts_rec_crash_safe_checksum.test
    modified:
      mysql-test/collections/default.experimental
      mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc
      mysql-test/extra/rpl_tests/rpl_mts_crash_safe.test
      mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mixed_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_checksum.result
      mysql-test/suite/rpl/t/rpl_stm_mixed_mts_rec_crash_safe_checksum.test
 5293 Tor Didriksen	2012-12-21 [merge]
      merge 5.6 => trunk

    modified:
      client/mysqltest.cc

Diff too large for email (29814 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (andrei.elkin:5293 to 5294) Andrei Elkin8 Jan