From: Jon Olav Hauglid Date: January 9 2012 8:32am Subject: bzr push into mysql-trunk-wl5534 branch (jon.hauglid:3460 to 3461) List-Archive: http://lists.mysql.com/commits/142338 Message-Id: <201201090832.q098WOwR026015@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3461 Jon Olav Hauglid 2012-01-09 [merge] Merge from mysql-trunk to mysql-trunk-wl5534 No conflicts modified: include/mysql/psi/mysql_socket.h include/mysql/psi/mysql_table.h include/mysql/psi/mysql_thread.h include/mysql/psi/psi.h include/mysql/psi/psi_abi_v0.h.pp include/mysql/psi/psi_abi_v1.h.pp include/mysql/psi/psi_abi_v2.h.pp mysql-test/collections/default.experimental mysql-test/include/show_slave_status.inc mysql-test/r/distinct.result mysql-test/r/group_by.result mysql-test/r/having.result mysql-test/r/innodb_explain_non_select_all.result mysql-test/r/innodb_icp.result mysql-test/r/innodb_icp_all.result mysql-test/r/innodb_icp_none.result mysql-test/r/innodb_mrr_all.result mysql-test/r/innodb_mrr_cost_all.result mysql-test/r/join.result mysql-test/r/join_outer.result mysql-test/r/join_outer_bka.result mysql-test/r/join_outer_bka_nixbnl.result mysql-test/r/myisam_icp.result mysql-test/r/myisam_icp_all.result mysql-test/r/myisam_icp_none.result mysql-test/r/myisampack.result mysql-test/r/select_all_bka.result mysql-test/r/select_all_bka_nixbnl.result mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test mysql-test/suite/engines/funcs/r/tc_rename_error.result mysql-test/suite/opt_trace/include/general2.inc 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/temp_table.result mysql-test/suite/perfschema/r/dml_handler.result mysql-test/suite/perfschema/r/innodb_table_io.result mysql-test/suite/perfschema/r/misc.result mysql-test/suite/perfschema/r/temp_table_io.result mysql-test/suite/perfschema/t/dml_handler.test mysql-test/suite/perfschema/t/misc.test mysql-test/suite/rpl/r/rpl_log_pos.result mysql-test/suite/rpl/r/rpl_manual_change_index_file.result mysql-test/suite/rpl/t/rpl_log_pos.test mysql-test/suite/rpl/t/rpl_manual_change_index_file.test mysql-test/t/distinct.test mysql-test/t/group_by.test mysql-test/t/having.test mysql-test/t/join.test mysql-test/t/join_outer.test mysql-test/t/myisampack.test mysys/psi_noop.c sql/field.h sql/field_conv.cc sql/handler.cc sql/item_sum.cc sql/opt_sum.cc sql/sql_base.cc sql/sql_db.cc sql/sql_executor.cc sql/sql_lex.cc sql/sql_optimizer.cc sql/sql_parse.cc sql/sql_planner.cc sql/sql_select.cc sql/sql_table.cc sql/sql_tmp_table.cc sql/table.cc sql/table.h storage/innobase/include/os0sync.ic storage/innobase/include/sync0rw.ic storage/innobase/include/sync0sync.ic storage/myisam/mi_create.c storage/perfschema/pfs.cc storage/perfschema/pfs_instr.cc storage/perfschema/pfs_instr.h storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_server.cc storage/perfschema/pfs_stat.h storage/perfschema/table_events_waits.cc storage/perfschema/unittest/pfs-t.cc unittest/gunit/bounded_queue-t.cc unittest/gunit/bounds_checked_array-t.cc unittest/gunit/cost_estimate-t.cc unittest/gunit/dbug-t.cc unittest/gunit/dynarray-t.cc unittest/gunit/field-t.cc unittest/gunit/filesort_buffer-t.cc unittest/gunit/get_diagnostics-t.cc unittest/gunit/gunit_test_main.cc unittest/gunit/item-t.cc unittest/gunit/mdl-t.cc unittest/gunit/mdl_mytap-t.cc unittest/gunit/my_regex-t.cc unittest/gunit/opt_range-t.cc unittest/gunit/opt_trace-t.cc unittest/gunit/sql_list-t.cc unittest/gunit/sql_plist-t.cc unittest/gunit/stdcxx-t.cc unittest/gunit/tap_event_listener.cc unittest/gunit/test_utils.cc unittest/gunit/thread_utils-t.cc unittest/gunit/thread_utils.cc 3460 Jon Olav Hauglid 2012-01-04 [merge] Merge from mysql-trunk to mysql-trunk-wl5534 No conflicts added: mysql-test/t/mysql_embedded-master.opt storage/innobase/buf/buf0dblwr.cc storage/innobase/include/buf0dblwr.h modified: client/mysql_upgrade.c client/mysqldump.c libmysqld/lib_sql.cc libmysqld/libmysqld.c mysql-test/collections/default.experimental mysql-test/mysql-test-run.pl mysql-test/r/func_group.result mysql-test/r/init_connect.result mysql-test/r/mysqldump.result mysql-test/r/sp.result mysql-test/r/xa.result mysql-test/suite/rpl/r/rpl_known_bugs_detection.result mysql-test/suite/rpl/t/rpl_known_bugs_detection.test mysql-test/t/func_group.test mysql-test/t/init_connect.test mysql-test/t/mysqldump.test mysql-test/t/sp.test mysql-test/t/xa.test mysys/my_conio.c sql/field.cc sql/opt_sum.cc sql/rpl_slave.cc sql/sql_class.h sql/sql_connect.cc sql/sql_parse.cc storage/federated/ha_federated.cc storage/innobase/CMakeLists.txt storage/innobase/buf/buf0buf.cc storage/innobase/buf/buf0flu.cc storage/innobase/buf/buf0lru.cc storage/innobase/buf/buf0rea.cc storage/innobase/handler/ha_innodb.cc storage/innobase/ibuf/ibuf0ibuf.cc storage/innobase/include/buf0types.h storage/innobase/include/mem0mem.ic storage/innobase/include/mtr0log.ic storage/innobase/include/os0file.h storage/innobase/include/srv0srv.h storage/innobase/include/sync0rw.h storage/innobase/include/sync0rw.ic storage/innobase/include/sync0sync.h storage/innobase/include/trx0sys.h storage/innobase/include/trx0types.h storage/innobase/include/univ.i storage/innobase/include/ut0mem.h storage/innobase/include/ut0rnd.ic storage/innobase/log/log0recv.cc storage/innobase/mem/mem0pool.cc storage/innobase/os/os0file.cc storage/innobase/os/os0proc.cc storage/innobase/row/row0sel.cc storage/innobase/srv/srv0srv.cc storage/innobase/srv/srv0start.cc storage/innobase/sync/sync0rw.cc storage/innobase/trx/trx0sys.cc storage/innobase/ut/ut0mem.cc Diff too large for email (10544 lines, the limit is 10000). No bundle (reason: useless for push emails).