From: Christopher Powers Date: September 21 2011 3:31pm Subject: bzr push into mysql-trunk-wl5908 branch (chris.powers:3422 to 3423) List-Archive: http://lists.mysql.com/commits/141059 Message-Id: <201109211531.p8LFVluM031553@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3423 Christopher Powers 2011-09-21 [merge] downmerge with mysql-trunk removed: scripts/make_binary_distribution.sh scripts/make_win_bin_dist added: mysql-test/r/auth_rpl.result mysql-test/suite/opt_trace/include/filesort_pq.inc mysql-test/suite/opt_trace/r/filesort_pq.result mysql-test/suite/opt_trace/t/filesort_pq.test mysql-test/t/auth_rpl-master.opt mysql-test/t/auth_rpl-slave.opt mysql-test/t/auth_rpl.test modified: cmake/mysql_version.cmake include/mysql/psi/mysql_socket.h libmysql/client_settings.h mysql-test/include/mtr_check.sql mysql-test/r/derived.result mysql-test/r/func_str.result mysql-test/r/myisampack.result mysql-test/r/query_cache.result mysql-test/r/range_all.result mysql-test/r/subquery_all.result mysql-test/r/subquery_all_bka.result mysql-test/r/subquery_sj_dupsweed.result mysql-test/r/subquery_sj_dupsweed_bka.result mysql-test/r/subquery_sj_dupsweed_bkaunique.result mysql-test/r/subquery_sj_loosescan.result mysql-test/r/subquery_sj_loosescan_bka.result mysql-test/r/subquery_sj_loosescan_bkaunique.result mysql-test/r/subquery_sj_mat.result mysql-test/r/subquery_sj_mat_bka.result mysql-test/r/subquery_sj_mat_bkaunique.result mysql-test/r/view_grant.result mysql-test/suite/innodb/r/innodb-index.result mysql-test/suite/innodb/t/innodb-index.test mysql-test/suite/opt_trace/r/general2_no_prot.result mysql-test/suite/opt_trace/r/general2_ps_prot.result mysql-test/suite/opt_trace/r/general_no_prot_none.result mysql-test/suite/opt_trace/r/general_ps_prot_none.result mysql-test/suite/opt_trace/r/range_no_prot.result mysql-test/suite/opt_trace/r/range_ps_prot.result mysql-test/suite/perfschema/r/pfs_upgrade.result mysql-test/suite/perfschema/t/socket_instances_func.test mysql-test/suite/perfschema/t/socket_instances_func_win.test mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test mysql-test/suite/rpl/r/rpl_row_ignorable_event.result mysql-test/suite/rpl/t/disabled.def mysql-test/suite/rpl/t/rpl_row_ignorable_event.test mysql-test/t/derived.test mysql-test/t/func_str.test mysql-test/t/myisampack.test mysql-test/t/query_cache.test mysql-test/t/view_grant.test mysql-test/valgrind.supp scripts/CMakeLists.txt scripts/mysql_system_tables.sql sql/client_settings.h sql/filesort.cc sql/opt_range.cc sql/opt_trace.h sql/rpl_slave.cc sql/share/errmsg-utf8.txt sql/sql_base.cc sql/sql_cache.cc sql/sql_select.cc sql/sql_test.cc sql/sql_test.h sql/sql_update.cc sql/table.h storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/row/row0purge.c storage/innobase/row/row0sel.c storage/innobase/sync/sync0sync.c storage/myisam/ft_boolean_search.c storage/myisam/ft_nlq_search.c storage/myisam/mi_check.c storage/myisam/mi_write.c storage/perfschema/pfs_instr.h strings/dtoa.c support-files/mysql.spec.sh 3422 Christopher Powers 2011-09-09 [merge] WL#5908 "Performance Schema File Summary Extensions" Merge w/ mysql-trunk modified: CMakeLists.txt config.h.cmake include/my_base.h mysql-test/collections/default.experimental mysql-test/collections/disabled-weekly.list mysql-test/include/icp_tests.inc mysql-test/r/innodb_icp.result mysql-test/r/innodb_icp_none.result mysql-test/r/innodb_mrr_cost_icp.result mysql-test/r/innodb_mrr_icp.result mysql-test/r/join.result mysql-test/r/myisam_icp.result mysql-test/r/myisam_icp_none.result mysql-test/r/subquery_sj_none.result mysql-test/r/subquery_sj_none_bka.result mysql-test/r/subquery_sj_none_bka_nobnl.result mysql-test/r/subquery_sj_none_bkaunique.result mysql-test/suite/innodb/r/innodb-index.result mysql-test/suite/innodb/t/innodb-index.test mysql-test/suite/opt_trace/r/bugs_no_prot_none.result mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result mysql-test/suite/rpl/t/disabled.def mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test mysql-test/t/join.test mysql-test/t/multi_plugin_load.test mysql-test/valgrind.supp mysys/my_handler_errors.h plugin/semisync/semisync_master.cc scripts/CMakeLists.txt scripts/mysql_install_db.pl.in scripts/mysql_install_db.sh sql/handler.cc sql/item.cc sql/item.h sql/share/errmsg-utf8.txt sql/sql_select.cc storage/innobase/CMakeLists.txt storage/innobase/btr/btr0btr.c storage/innobase/btr/btr0cur.c storage/innobase/buf/buf0buddy.c storage/innobase/buf/buf0buf.c storage/innobase/buf/buf0flu.c storage/innobase/data/data0data.c storage/innobase/dict/dict0dict.c storage/innobase/dict/dict0load.c storage/innobase/fsp/fsp0fsp.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/i_s.cc storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/btr0btr.ic storage/innobase/include/buf0buf.h storage/innobase/include/buf0buf.ic storage/innobase/include/data0data.ic storage/innobase/include/data0type.ic storage/innobase/include/db0err.h storage/innobase/include/dict0dict.ic storage/innobase/include/dict0load.h storage/innobase/include/page0page.h storage/innobase/include/page0page.ic storage/innobase/include/page0zip.ic storage/innobase/include/rem0rec.ic storage/innobase/include/row0upd.ic storage/innobase/include/sync0sync.h storage/innobase/include/trx0sys.h storage/innobase/include/trx0trx.h storage/innobase/include/trx0undo.h storage/innobase/include/univ.i storage/innobase/mtr/mtr0log.c storage/innobase/page/page0cur.c storage/innobase/page/page0page.c storage/innobase/page/page0zip.c storage/innobase/rem/rem0cmp.c storage/innobase/row/row0merge.c storage/innobase/row/row0mysql.c storage/innobase/row/row0row.c storage/innobase/row/row0sel.c storage/innobase/row/row0upd.c storage/innobase/srv/srv0start.c storage/innobase/sync/sync0sync.c storage/innobase/trx/trx0rec.c storage/innobase/trx/trx0undo.c storage/innobase/ut/ut0ut.c storage/myisam/ha_myisam.cc unittest/gunit/CMakeLists.txt Diff too large for email (16735 lines, the limit is 10000). No bundle (reason: useless for push emails).