From: Jon Olav Hauglid Date: April 25 2012 9:47am Subject: bzr push into mysql-trunk-wl6168 branch (jon.hauglid:3868 to 3869) List-Archive: http://lists.mysql.com/commits/143653 Message-Id: <201204250947.q3P9lC9A021097@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3869 Jon Olav Hauglid 2012-04-25 [merge] Merge from mysql-trunk to mysql-trunk-wl6168 Text conflict in mysql-test/suite/perfschema/r/digest_table_full.result Text conflict in mysql-test/suite/perfschema/r/statement_digest.result Text conflict in mysql-test/suite/perfschema/r/statement_digest_consumers.result Text conflict in mysql-test/suite/perfschema/r/statement_digest_long_query.result removed: mysql-test/suite/sys_vars/r/innodb_analyze_is_persistent_basic.result mysql-test/suite/sys_vars/t/innodb_analyze_is_persistent_basic.test added: mysql-test/r/bug12427262.result mysql-test/r/myisam_row_rpl.result mysql-test/r/mysql_embedded_client_test.result mysql-test/suite/innodb/include/innodb_stats_table_flag.inc mysql-test/suite/innodb/include/innodb_stats_table_flag_analyze.inc mysql-test/suite/innodb/r/innodb-alter-discard.result mysql-test/suite/innodb/r/innodb_stats_create_on_corrupted.result mysql-test/suite/innodb/r/innodb_stats_create_table.result mysql-test/suite/innodb/r/innodb_stats_fetch.result mysql-test/suite/innodb/r/innodb_stats_fetch_corrupted.result mysql-test/suite/innodb/r/innodb_stats_fetch_nonexistent.result mysql-test/suite/innodb/r/innodb_stats_flag_global_off.result mysql-test/suite/innodb/r/innodb_stats_flag_global_on.result mysql-test/suite/innodb/r/innodb_upd_stats_if_needed_not_inited.result mysql-test/suite/innodb/r/innodb_ut_format_name.result mysql-test/suite/innodb/t/innodb-alter-discard.test mysql-test/suite/innodb/t/innodb_stats_create_on_corrupted.test mysql-test/suite/innodb/t/innodb_stats_create_table.test mysql-test/suite/innodb/t/innodb_stats_fetch.test mysql-test/suite/innodb/t/innodb_stats_fetch_corrupted.test mysql-test/suite/innodb/t/innodb_stats_fetch_nonexistent.test mysql-test/suite/innodb/t/innodb_stats_flag_global_off-master.opt mysql-test/suite/innodb/t/innodb_stats_flag_global_off.test mysql-test/suite/innodb/t/innodb_stats_flag_global_on-master.opt mysql-test/suite/innodb/t/innodb_stats_flag_global_on.test mysql-test/suite/innodb/t/innodb_upd_stats_if_needed_not_inited.test mysql-test/suite/innodb/t/innodb_ut_format_name.test mysql-test/suite/innodb_fts/r/innodb_fts_opt.result mysql-test/suite/innodb_fts/t/innodb_fts_opt.test mysql-test/suite/rpl/r/rpl_auto_increment_bug45679.result mysql-test/suite/rpl/r/rpl_parallel_show_binlog_events_purge_logs.result mysql-test/suite/rpl/t/rpl_auto_increment_bug45679.test mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test mysql-test/suite/sys_vars/r/innodb_stats_persistent_basic.result mysql-test/suite/sys_vars/r/transaction_allow_batching_basic.result mysql-test/suite/sys_vars/t/innodb_stats_persistent_basic.test mysql-test/suite/sys_vars/t/transaction_allow_batching_basic.test mysql-test/t/bug12427262.test mysql-test/t/myisam_row_rpl-master.opt mysql-test/t/myisam_row_rpl-slave.opt mysql-test/t/myisam_row_rpl.test mysql-test/t/mysql_embedded_client_test.test storage/innobase/include/dict0stats.ic modified: CMakeLists.txt README VERSION 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 client/mysqltest.cc cmake/os/Windows.cmake config.h.cmake configure.cmake extra/innochecksum.cc extra/perror.c include/ft_global.h include/my_base.h include/mysql/thread_pool_priv.h include/mysql_com.h include/welcome_copyright_notice.h libmysqld/lib_sql.cc mysql-test/collections/default.push mysql-test/extra/rpl_tests/rpl_loaddata.test mysql-test/extra/rpl_tests/rpl_row_basic.test mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test mysql-test/include/assert_command_output.inc mysql-test/include/function_defaults.inc mysql-test/lib/My/CoreDump.pm mysql-test/mysql-test-run.pl mysql-test/r/archive.result mysql-test/r/cast.result mysql-test/r/ctype_utf8mb4.result mysql-test/r/derived.result mysql-test/r/explain.result mysql-test/r/fulltext.result mysql-test/r/func_group_innodb.result mysql-test/r/func_time.result mysql-test/r/function_defaults.result mysql-test/r/get_diagnostics.result mysql-test/r/group_by.result mysql-test/r/innodb_explain_json_non_select_all.result mysql-test/r/innodb_explain_json_non_select_none.result mysql-test/r/innodb_explain_non_select_all.result mysql-test/r/innodb_explain_non_select_none.result mysql-test/r/log_tables.result mysql-test/r/myisam_explain_json_non_select_all.result mysql-test/r/myisam_explain_json_non_select_none.result mysql-test/r/myisam_explain_non_select_all.result mysql-test/r/myisam_explain_non_select_none.result mysql-test/r/olap.result mysql-test/r/partition_error.result mysql-test/r/partition_exchange.result mysql-test/r/read_only_innodb.result mysql-test/r/rewrite_general_log.result mysql-test/r/show_check.result mysql-test/r/sp-destruct.result mysql-test/r/sp-threads.result mysql-test/r/tablespace.result mysql-test/r/type_temporal_fractional.result mysql-test/r/type_time.result mysql-test/r/variables.result mysql-test/suite/binlog/r/binlog_grant.result mysql-test/suite/binlog/r/binlog_multi_engine.result mysql-test/suite/binlog/r/binlog_rewrite.result mysql-test/suite/binlog/t/binlog_grant.test mysql-test/suite/engines/funcs/t/crash_manytables_number.test mysql-test/suite/engines/funcs/t/ld_all_number_string_calendar_types.test mysql-test/suite/engines/funcs/t/se_join_cross.test mysql-test/suite/engines/funcs/t/se_join_default.test mysql-test/suite/engines/funcs/t/se_join_inner.test mysql-test/suite/engines/funcs/t/se_join_left.test mysql-test/suite/engines/funcs/t/se_join_natural_left.test mysql-test/suite/engines/funcs/t/se_join_natural_left_outer.test mysql-test/suite/engines/funcs/t/se_join_natural_right.test mysql-test/suite/engines/funcs/t/se_join_natural_right_outer.test mysql-test/suite/engines/funcs/t/se_join_right.test mysql-test/suite/engines/funcs/t/se_join_right_outer.test mysql-test/suite/engines/funcs/t/se_join_straight.test mysql-test/suite/engines/funcs/t/se_string_limit.test mysql-test/suite/engines/iuds/t/update_delete_number.test mysql-test/suite/funcs_1/datadict/processlist_priv.inc mysql-test/suite/funcs_1/datadict/processlist_val.inc mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result mysql-test/suite/funcs_1/r/processlist_priv_ps.result mysql-test/suite/funcs_1/r/processlist_val_no_prot.result mysql-test/suite/funcs_1/r/processlist_val_ps.result mysql-test/suite/innodb/include/innodb_stats.inc mysql-test/suite/innodb/r/innodb-index-online.result mysql-test/suite/innodb/r/innodb_bug11933790.result mysql-test/suite/innodb/r/innodb_bug12429573.result mysql-test/suite/innodb/r/innodb_stats.result mysql-test/suite/innodb/r/innodb_stats_drop_locked.result mysql-test/suite/innodb/t/innodb-blob.test mysql-test/suite/innodb/t/innodb-index-online.test mysql-test/suite/innodb/t/innodb_bug11933790.test mysql-test/suite/innodb/t/innodb_bug12429573.test mysql-test/suite/innodb/t/innodb_bug30423.test mysql-test/suite/innodb/t/innodb_bug53290.test mysql-test/suite/innodb/t/innodb_stats.test mysql-test/suite/innodb/t/innodb_stats_drop_locked.test mysql-test/suite/innodb_fts/r/innodb_fts_misc.result mysql-test/suite/innodb_fts/t/innodb_fts_misc.test mysql-test/suite/parts/r/partition_exch_qa_12.result mysql-test/suite/parts/t/partition_exch_qa_12.test mysql-test/suite/parts/t/partition_float_myisam.test mysql-test/suite/perfschema/r/digest_table_full.result mysql-test/suite/perfschema/r/statement_digest.result mysql-test/suite/perfschema/r/statement_digest_consumers.result mysql-test/suite/perfschema/r/statement_digest_long_query.result mysql-test/suite/rpl/r/rpl_alter_repository.result mysql-test/suite/rpl/r/rpl_binlog_index.result mysql-test/suite/rpl/r/rpl_corruption.result mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result mysql-test/suite/rpl/r/rpl_gtid_mode.result mysql-test/suite/rpl/r/rpl_loaddata.result mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_mts_debug.result mysql-test/suite/rpl/r/rpl_parallel_start_stop.result mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result mysql-test/suite/rpl/r/rpl_row_basic_allow_batching.result mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_stm_EE_err2.result mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result mysql-test/suite/rpl/t/rpl_alter_repository.test mysql-test/suite/rpl/t/rpl_binlog_index.test mysql-test/suite/rpl/t/rpl_corruption.test mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test mysql-test/suite/rpl/t/rpl_gtid_mode.test mysql-test/suite/rpl/t/rpl_innodb_bug28430.test mysql-test/suite/rpl/t/rpl_mts_debug.test mysql-test/suite/rpl/t/rpl_parallel_change_master.test mysql-test/suite/rpl/t/rpl_parallel_innodb.test mysql-test/suite/rpl/t/rpl_parallel_start_stop.test mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock.test mysql-test/suite/rpl/t/rpl_row_img_blobs.test mysql-test/suite/rpl/t/rpl_row_img_eng_full.test mysql-test/suite/rpl/t/rpl_row_img_idx_full.test mysql-test/suite/rpl/t/rpl_stop_slave.test mysql-test/suite/rpl/t/rpl_typeconv.test mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result mysql-test/t/archive.test mysql-test/t/cast.test mysql-test/t/ctype_utf8mb4.test mysql-test/t/derived.test mysql-test/t/disabled.def mysql-test/t/fulltext.test mysql-test/t/func_group_innodb.test mysql-test/t/func_time.test mysql-test/t/group_by.test mysql-test/t/index_merge_innodb.test mysql-test/t/innodb_explain_json_non_select_all.test mysql-test/t/innodb_explain_non_select_all.test mysql-test/t/innodb_explain_non_select_none.test mysql-test/t/mysql_client_test_embedded.test mysql-test/t/olap.test mysql-test/t/partition_exchange.test mysql-test/t/rewrite_general_log.test mysql-test/t/show_check.test mysql-test/t/sp-threads.test mysql-test/t/tablespace.test mysql-test/t/type_temporal_fractional.test packaging/WiX/custom_ui.wxs scripts/mysql_system_tables.sql sql/binlog.cc sql/event_scheduler.cc sql/field.cc sql/field.h sql/field_conv.cc sql/gen_lex_hash.cc sql/global_threads.h sql/ha_ndbcluster_binlog.cc sql/handler.cc sql/handler.h sql/item.cc sql/item.h sql/item_buff.cc sql/item_create.cc sql/item_func.cc sql/item_func.h sql/item_strfunc.cc sql/item_strfunc.h sql/item_subselect.cc sql/item_timefunc.cc sql/item_timefunc.h sql/item_xmlfunc.cc sql/lex.h sql/log.h sql/log_event.cc sql/log_event.h sql/mysqld.cc sql/mysqld.h sql/opt_range.cc sql/opt_sum.cc sql/rpl_info_file.cc sql/rpl_master.cc sql/rpl_mi.cc sql/rpl_rli.cc sql/rpl_rli.h sql/rpl_rli_pdb.cc sql/rpl_slave.cc sql/rpl_slave.h sql/rpl_utility.cc sql/rpl_utility.h sql/scheduler.cc sql/set_var.cc sql/share/errmsg-utf8.txt sql/signal_handler.cc sql/sp_head.cc sql/sql_analyse.cc sql/sql_base.cc sql/sql_class.cc sql/sql_class.h sql/sql_derived.cc sql/sql_executor.cc sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_optimizer.cc sql/sql_optimizer.h sql/sql_parse.cc sql/sql_partition_admin.cc sql/sql_plugin.cc sql/sql_reload.cc sql/sql_select.cc sql/sql_show.cc sql/sql_show.h sql/sql_string.h sql/sql_table.cc sql/sql_test.cc sql/sql_view.cc sql/sql_yacc.yy sql/sys_vars.cc sql/table.cc sql/unireg.cc storage/archive/ha_archive.cc storage/innobase/api/api0api.cc storage/innobase/btr/btr0cur.cc storage/innobase/buf/buf0flu.cc storage/innobase/dict/dict0dict.cc storage/innobase/dict/dict0load.cc storage/innobase/dict/dict0stats.cc storage/innobase/fts/fts0ast.cc storage/innobase/fts/fts0blex.cc storage/innobase/fts/fts0blex.l storage/innobase/fts/fts0fts.cc storage/innobase/fts/fts0opt.cc storage/innobase/fts/fts0que.cc storage/innobase/fts/fts0tlex.cc storage/innobase/fts/fts0tlex.l storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/innobase/handler/handler0alter.cc storage/innobase/handler/i_s.cc storage/innobase/include/btr0btr.h storage/innobase/include/btr0pcur.ic storage/innobase/include/dict0dict.h storage/innobase/include/dict0dict.ic storage/innobase/include/dict0mem.h storage/innobase/include/dict0stats.h storage/innobase/include/fts0ast.h storage/innobase/include/fts0priv.h storage/innobase/include/read0read.h storage/innobase/include/read0read.ic storage/innobase/include/srv0srv.h storage/innobase/include/ut0ut.h storage/innobase/log/log0recv.cc storage/innobase/pars/lexyy.cc storage/innobase/pars/pars0lex.l storage/innobase/pars/pars0pars.cc storage/innobase/read/read0read.cc storage/innobase/row/row0ftsort.cc storage/innobase/row/row0ins.cc storage/innobase/row/row0merge.cc storage/innobase/row/row0mysql.cc storage/innobase/row/row0sel.cc storage/innobase/row/row0upd.cc storage/innobase/srv/srv0srv.cc storage/innobase/srv/srv0start.cc storage/innobase/trx/trx0trx.cc storage/innobase/ut/ut0ut.cc storage/myisam/ha_myisam.cc storage/ndb/compile-cluster storage/perfschema/gen_pfs_lex_token.cc storage/perfschema/pfs_check.cc strings/decimal.c unittest/gunit/alignment-t.cc unittest/gunit/fake_table.h unittest/gunit/field-t.cc unittest/gunit/field_timestamp-t.cc 3868 Jon Olav Hauglid 2012-04-25 Change tree name modified: .bzr-mysql/default.conf Diff too large for email (22192 lines, the limit is 10000). No bundle (reason: useless for push emails).