This brings the following changesets:
  Marc Alff 2011-09-26 BUG#12993572 - P_S STANDBY MODE CAUSES PERFORMANCE DROP
    Guilhem Bichot 2011-09-23 Fix for Bug#13009176 "USE DATABASE BREAKS OPTIMIZER TRACE IF THERE IS A VIEW IN THE SCHEMA"
    Luis Soares 2011-09-22 BUG#12987771: REPLICATED STATEMENTS ARE DUPLICATED 
    Olav Sandstaa 2011-09-20 Fix for Bug#12976163 "CRASH IN INDEX CONDITION PUSHDOWN CODE AGAINST 
    Evgeny Potemkin 2011-09-19 Bug#12977203: SERVER CRASH ON A DERIVED TABLE WITH QUERY CACHE ENABLED
    Sunny Bains 2011-09-17 Bug 12982772 - SERVER DOES NOT START WITH INNODB_UNDO_TABLESPACES (SYSTEM ERROR 32 FILE IN USE)
    Evgeny Potemkin 2011-09-15 Bug#12910006: MRR initialization on a derived table caused crash.
    Georgi Kodinov 2011-09-13 Bug #12925024: MYSQLD_SAFE IGNORES THE VALUE OF PLUGIN_DIR FROM MY.CNF
    Gleb Shchepa 2011-09-09 Bug #12949629: CLIENT LOSES CONNECTION AFTER EXECUTING
    Andrei Elkin 2011-09-09 Bug#12947451 - MTS: ERROR LOG GETS FLOODED WITH SYNCHRONIZATION-RELATED MESSAGES (NOTES)
    Oystein Grovlen 2011-09-07 WL#5285
    Guilhem Bichot 2011-08-31 1) fix for BUG#12905521 - ASSERT IN OPT_TRACE_STMT::SYNTAX_ERROR ON SELECT DISTINCT/MIN/JOIN/SUBQ QUERY
    Jonathan Perkin 2011-08-30 Bump milestone.
    Joerg Bruehe 2011-08-30 [merge] Merge a RPM packaging bugfix into the 5.6.3 release clone.
    hery.ramilison@or... 2011-08-29 Applying patch from vasil.dimov@oracle.com for OS X build failure

Conflicts:
Text conflict in VERSION
Text conflict in mysql-test/include/icp_tests.inc
Text conflict in mysql-test/r/derived.result
Text conflict in mysql-test/r/innodb_icp.result
Text conflict in mysql-test/r/innodb_icp_none.result
Contents conflict in mysql-test/r/join_cache_bka_nobnl.result
Contents conflict in mysql-test/r/join_nested_bka_nobnl.result
Contents conflict in mysql-test/r/join_outer_bka_nobnl.result
Text conflict in mysql-test/r/myisam_icp.result
Text conflict in mysql-test/r/myisam_icp_none.result
Contents conflict in mysql-test/r/select_all_bka_nobnl.result
Contents conflict in mysql-test/r/select_icp_mrr_bka_nobnl.result
Contents conflict in mysql-test/r/select_none_bka_nobnl.result
Contents conflict in mysql-test/r/subquery_all_bka_nobnl.result
Contents conflict in mysql-test/r/subquery_nomat_nosj_bka_nobnl.result
Contents conflict in mysql-test/r/subquery_none_bka_nobnl.result
Contents conflict in mysql-test/r/subquery_sj_all_bka_nobnl.result
Contents conflict in mysql-test/r/subquery_sj_dupsweed_bka_nobnl.result
Contents conflict in mysql-test/r/subquery_sj_firstmatch_bka_nobnl.result
Contents conflict in mysql-test/r/subquery_sj_innodb_all_bka_nobnl.result
Contents conflict in mysql-test/r/subquery_sj_innodb_none_bka_nobnl.result
Contents conflict in mysql-test/r/subquery_sj_loosescan_bka_nobnl.result
Contents conflict in mysql-test/r/subquery_sj_mat_bka_nobnl.result
Contents conflict in mysql-test/r/subquery_sj_none_bka_nobnl.result
Text conflict in mysql-test/suite/opt_trace/r/general_no_prot_all.result
Text conflict in mysql-test/suite/opt_trace/r/general_no_prot_none.result
Text conflict in mysql-test/suite/opt_trace/r/general_ps_prot_all.result
Text conflict in mysql-test/suite/opt_trace/r/general_ps_prot_none.result
Text conflict in mysql-test/t/derived.test
Contents conflict in mysql-test/t/join_cache_bka_nobnl.test
Contents conflict in mysql-test/t/join_nested_bka_nobnl.test
Contents conflict in mysql-test/t/join_outer_bka_nobnl.test
Contents conflict in mysql-test/t/select_all_bka_nobnl.test
Contents conflict in mysql-test/t/select_icp_mrr_bka_nobnl.test
Contents conflict in mysql-test/t/select_none_bka_nobnl.test
Contents conflict in mysql-test/t/subquery_all_bka_nobnl.test
Contents conflict in mysql-test/t/subquery_nomat_nosj_bka_nobnl.test
Contents conflict in mysql-test/t/subquery_none_bka_nobnl.test
Contents conflict in mysql-test/t/subquery_sj_all_bka_nobnl.test
Contents conflict in mysql-test/t/subquery_sj_dupsweed_bka_nobnl.test
Contents conflict in mysql-test/t/subquery_sj_firstmatch_bka_nobnl.test
Contents conflict in mysql-test/t/subquery_sj_innodb_all_bka_nobnl.test
Contents conflict in mysql-test/t/subquery_sj_innodb_none_bka_nobnl.test
Contents conflict in mysql-test/t/subquery_sj_loosescan_bka_nobnl.test
Contents conflict in mysql-test/t/subquery_sj_mat_bka_nobnl.test
Contents conflict in mysql-test/t/subquery_sj_none_bka_nobnl.test
Text conflict in sql/rpl_rli_pdb.cc
47 conflicts encountered.