From: Jon Olav Hauglid Date: January 16 2012 10:33am Subject: bzr push into mysql-trunk-wl5534 branch (jon.hauglid:3461 to 3462) List-Archive: http://lists.mysql.com/commits/142412 Message-Id: <201201161033.q0GAXnr1008493@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3462 Jon Olav Hauglid 2012-01-16 [merge] Merge from mysql-trunk to mysql-trunk-wl5534 No conflicts added: include/byteorder/ include/byteorder/big_endian.h include/byteorder/byte_order_generic.h include/byteorder/byte_order_generic_x86.h include/byteorder/byte_order_generic_x86_64.h include/byteorder/little_endian.h include/my_byteorder.h mysql-test/r/mysqlimport.result mysql-test/suite/innodb/r/innodb_bug12400341.result mysql-test/suite/innodb/t/innodb_bug12400341-master.opt mysql-test/suite/innodb/t/innodb_bug12400341.test mysql-test/t/mysqlimport.test unittest/gunit/alignment-t.cc unittest/gunit/byteorder-t.cc modified: client/mysql.cc client/mysql_upgrade.c client/mysqladmin.cc client/mysqlbinlog.cc client/mysqlcheck.c client/mysqldump.c client/mysqlimport.c client/mysqlshow.c client/mysqlslap.c cmd-line-utils/libedit/chartype.h cmd-line-utils/libedit/eln.c cmd-line-utils/libedit/readline.c config.h.cmake include/CMakeLists.txt include/my_getopt.h include/my_global.h libmysqld/emb_qcache.cc mysql-test/collections/default.experimental mysql-test/include/subquery_mat.inc mysql-test/include/subquery_sj.inc mysql-test/r/archive_gis.result mysql-test/r/case.result mysql-test/r/ctype_many.result mysql-test/r/func_if.result mysql-test/r/func_set.result mysql-test/r/func_time.result mysql-test/r/gis.result mysql-test/r/group_by.result mysql-test/r/key_cache.result mysql-test/r/log_tables_upgrade.result mysql-test/r/mysql.result mysql-test/r/mysql_upgrade.result mysql-test/r/mysql_upgrade_ssl.result mysql-test/r/mysqladmin.result mysql-test/r/mysqlbinlog.result mysql-test/r/mysqlcheck.result mysql-test/r/mysqldump.result mysql-test/r/mysqlshow.result mysql-test/r/mysqlslap.result mysql-test/r/partition_key_cache.result mysql-test/r/plugin_auth.result mysql-test/r/plugin_auth_qa_1.result mysql-test/r/plugin_auth_qa_2.result mysql-test/r/plugin_auth_qa_3.result mysql-test/r/subquery_mat.result mysql-test/r/subquery_mat_all.result mysql-test/r/subquery_mat_none.result mysql-test/r/subquery_sj_all.result mysql-test/r/subquery_sj_all_bka.result mysql-test/r/subquery_sj_all_bka_nixbnl.result mysql-test/r/subquery_sj_all_bkaunique.result mysql-test/r/subquery_sj_dupsweed.result mysql-test/r/subquery_sj_dupsweed_bka.result mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result mysql-test/r/subquery_sj_dupsweed_bkaunique.result mysql-test/r/subquery_sj_firstmatch.result mysql-test/r/subquery_sj_firstmatch_bka.result mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result mysql-test/r/subquery_sj_firstmatch_bkaunique.result mysql-test/r/subquery_sj_loosescan.result mysql-test/r/subquery_sj_loosescan_bka.result mysql-test/r/subquery_sj_loosescan_bka_nixbnl.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_bka_nixbnl.result mysql-test/r/subquery_sj_mat_bkaunique.result mysql-test/r/subquery_sj_mat_nosj.result mysql-test/r/subquery_sj_none.result mysql-test/r/subquery_sj_none_bka.result mysql-test/r/subquery_sj_none_bka_nixbnl.result mysql-test/r/subquery_sj_none_bkaunique.result mysql-test/r/view.result mysql-test/r/view_alias.result mysql-test/suite/federated/federated_debug.result mysql-test/suite/innodb/r/innodb_gis.result mysql-test/suite/innodb_fts/r/innodb_fts_large_records.result mysql-test/suite/innodb_fts/t/disabled.def mysql-test/suite/innodb_fts/t/innodb_fts_large_records.test mysql-test/suite/opt_trace/r/filesort_pq.result 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/subquery_no_prot.result mysql-test/suite/opt_trace/r/subquery_ps_prot.result mysql-test/suite/perfschema/r/pfs_upgrade.result mysql-test/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/t/all_vars.test mysql-test/suite/sys_vars/t/disabled.def mysql-test/t/ctype_many.test mysql-test/t/func_set.test mysql-test/t/func_time.test mysql-test/t/group_by.test mysql-test/t/key_cache.test mysql-test/t/mysql.test mysql-test/t/mysql_upgrade.test mysql-test/t/mysqladmin.test mysql-test/t/mysqlbinlog.test mysql-test/t/mysqlcheck.test mysql-test/t/mysqldump.test mysql-test/t/mysqlshow.test mysql-test/t/mysqlslap.test mysql-test/t/partition_key_cache.test mysys/default.c mysys/my_getopt.c sql/binlog.cc sql/filesort.cc sql/ha_partition.cc sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_cmpfunc.h sql/item_strfunc.h sql/item_timefunc.cc sql/log_event.cc sql/rpl_slave.cc sql/spatial.cc sql/sql_admin.cc sql/sql_executor.cc sql/sql_join_buffer.h sql/sql_lex.cc sql/sql_optimizer.cc sql/sql_parse.cc sql/sql_planner.cc sql/sql_resolver.cc sql/sql_select.cc sql/sql_select.h sql/sql_tmp_table.cc sql/table.h sql/unireg.cc storage/archive/ha_archive.cc storage/innobase/buf/buf0buf.cc storage/innobase/fts/fts0fts.cc storage/innobase/handler/ha_innodb.cc storage/innobase/include/trx0rseg.ic storage/innobase/include/trx0sys.h storage/innobase/row/row0mysql.cc storage/innobase/trx/trx0sys.cc storage/myisam/mi_preload.c unittest/gunit/CMakeLists.txt 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 Diff too large for email (15003 lines, the limit is 10000). No bundle (reason: useless for push emails).