List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:September 23 2010 9:11am
Subject:bzr push into mysql-next-mr-opt-team branch (tor.didriksen:3220 to 3221)
View as plain text  
 3221 Tor Didriksen	2010-09-23 [merge]
      Null merge from next-mr-opt-backporting

 3220 Tor Didriksen	2010-09-23 [merge]
      Auto-merge: next-mr-opt-backporting => next-mr-opt-team

    added:
      mysql-test/include/rpl_assert.inc
      mysql-test/suite/perfschema/r/checksum.result
      mysql-test/suite/perfschema/t/checksum.test
    modified:
      dbug/dbug.c
      include/mysql/service_my_snprintf.h
      libservices/HOWTO
      mysql-test/extra/rpl_tests/delayed_slave_wait_on_query.inc
      mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test
      mysql-test/include/wait_for_slave_param.inc
      mysql-test/r/variables.result
      mysql-test/suite/perfschema/r/server_init.result
      mysql-test/suite/perfschema/t/server_init.test
      mysql-test/suite/rpl/r/rpl_delayed_slave.result
      mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
      mysql-test/suite/rpl/t/rpl_delayed_slave.test
      mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size-master.opt
      mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size-master.opt
      mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size-master.opt
      mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result
      mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic.test
      mysql-test/t/variables.test
      mysql-test/valgrind.supp
      packaging/WiX/mysql_server.wxs.in
      sql/binlog.cc
      sql/binlog.h
      sql/mysqld.cc
      sql/rpl_master.cc
      sql/rpl_rli.cc
      sql/rpl_slave.cc
      sql/share/errmsg-utf8.txt
      sql/sql_binlog.cc
      sql/sql_plugin.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sys_vars.cc
      storage/perfschema/pfs_engine_table.cc
      storage/perfschema/table_events_waits.cc
      storage/perfschema/table_events_waits.h
      strings/my_vsnprintf.c
      unittest/mysys/my_vsnprintf-t.c

Attachment: [text/bzr-bundle] bzr/tor.didriksen@oracle.com-20100923091002-oiyt9tobbbjhked6.bundle
Thread
bzr push into mysql-next-mr-opt-team branch (tor.didriksen:3220 to 3221) Tor Didriksen23 Sep