From: Andrei Elkin Date: December 19 2011 6:22pm Subject: bzr push into mysql-trunk branch (andrei.elkin:3661 to 3662) Bug#12964649 List-Archive: http://lists.mysql.com/commits/142195 X-Bug: 12964649 Message-Id: <201112191822.pBJIMdOV015817@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3662 Andrei Elkin 2011-12-19 BUG#12964649 fixing slave_checkpoint_group_basic. modified: sql/sys_vars.cc 3661 Andrei Elkin 2011-12-19 [merge] merge from the repo. added: mysql-test/suite/perfschema/r/start_server_disable_idle.result mysql-test/suite/perfschema/r/start_server_disable_stages.result mysql-test/suite/perfschema/r/start_server_disable_statements.result mysql-test/suite/perfschema/r/start_server_disable_waits.result mysql-test/suite/perfschema/t/start_server_disable_idle-master.opt mysql-test/suite/perfschema/t/start_server_disable_idle.test mysql-test/suite/perfschema/t/start_server_disable_stages-master.opt mysql-test/suite/perfschema/t/start_server_disable_stages.test mysql-test/suite/perfschema/t/start_server_disable_statements-master.opt mysql-test/suite/perfschema/t/start_server_disable_statements.test mysql-test/suite/perfschema/t/start_server_disable_waits-master.opt mysql-test/suite/perfschema/t/start_server_disable_waits.test sql/sql_executor.cc sql/sql_executor.h sql/sql_join_buffer.h sql/sql_optimizer.cc sql/sql_optimizer.h sql/sql_planner.cc sql/sql_planner.h sql/sql_resolver.cc sql/sql_resolver.h sql/sql_tmp_table.cc sql/sql_tmp_table.h renamed: sql/sql_join_cache.cc => sql/sql_join_buffer.cc modified: cmake/install_macros.cmake mysql-test/include/order_by.inc mysql-test/include/range.inc mysql-test/include/select.inc mysql-test/include/subquery_sj.inc mysql-test/r/func_in_all.result mysql-test/r/innodb_explain_non_select_all.result mysql-test/r/innodb_explain_non_select_none.result mysql-test/r/innodb_mrr_all.result mysql-test/r/innodb_mrr_cost_all.result mysql-test/r/myisam_mrr_all.result mysql-test/r/myisam_mrr_cost_all.result mysql-test/r/order_by_all.result mysql-test/r/order_by_icp_mrr.result mysql-test/r/order_by_none.result mysql-test/r/partition_hash.result mysql-test/r/partition_list.result mysql-test/r/partition_mgm.result mysql-test/r/ps_ddl.result mysql-test/r/range_all.result mysql-test/r/range_icp.result mysql-test/r/range_icp_mrr.result mysql-test/r/range_mrr.result mysql-test/r/range_mrr_cost.result mysql-test/r/range_none.result mysql-test/r/select_all.result mysql-test/r/select_icp_mrr.result mysql-test/r/select_icp_mrr_bka.result mysql-test/r/select_icp_mrr_bka_nixbnl.result mysql-test/r/select_none.result mysql-test/r/select_none_bka.result mysql-test/r/select_none_bka_nixbnl.result mysql-test/r/sp.result mysql-test/r/subquery_all.result mysql-test/r/subquery_all_bka.result mysql-test/r/subquery_all_bka_nixbnl.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/type_temporal_fractional.result mysql-test/r/update.result mysql-test/suite/binlog/t/binlog_index.test mysql-test/suite/rpl/r/rpl_row_img_sanity.result mysql-test/suite/rpl/t/rpl_binlog_errors.test mysql-test/suite/rpl/t/rpl_empty_master_host.test mysql-test/suite/rpl/t/rpl_row_img_sanity.test mysql-test/suite/rpl/t/rpl_server_id_ignore.test mysql-test/t/partition_hash.test mysql-test/t/partition_list.test mysql-test/t/partition_mgm.test mysql-test/t/ps_ddl.test mysql-test/t/sp.test mysql-test/t/type_temporal_fractional.test mysql-test/t/update.test scripts/mysql_system_tables.sql sql/CMakeLists.txt sql/field.cc sql/ha_partition.cc sql/ha_partition.h sql/item.cc sql/item_cmpfunc.cc sql/item_strfunc.cc sql/item_subselect.cc sql/item_sum.cc sql/item_timefunc.cc sql/opt_explain.cc sql/opt_explain.h sql/opt_range.cc sql/opt_range.h sql/partition_element.h sql/partition_info.cc sql/partition_info.h sql/records.cc sql/records.h sql/rpl_utility.cc sql/sp_rcontext.cc sql/sql_admin.cc sql/sql_base.cc sql/sql_class.cc sql/sql_class.h sql/sql_cursor.cc sql/sql_delete.cc sql/sql_derived.cc sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_partition.cc sql/sql_partition.h sql/sql_select.cc sql/sql_select.h sql/sql_show.cc sql/sql_table.cc sql/sql_test.cc sql/sql_union.cc sql/sql_update.cc sql/sql_view.cc sql/sql_yacc.yy sql/table.h sql/unireg.h storage/innobase/dict/dict0dict.cc storage/innobase/dict/dict0mem.cc storage/innobase/dict/dict0stats.cc storage/innobase/fts/fts0fts.cc storage/innobase/include/fts0fts.h storage/innobase/include/sync0sync.h storage/innobase/row/row0mysql.cc storage/perfschema/pfs.cc sql/sql_join_buffer.cc === modified file 'sql/sys_vars.cc' --- a/sql/sys_vars.cc 2011-12-16 15:54:23 +0000 +++ b/sql/sys_vars.cc 2011-12-19 18:05:58 +0000 @@ -3652,7 +3652,7 @@ static Sys_var_uint Sys_checkpoint_mts_g #ifndef DBUG_OFF VALID_RANGE(1, MTS_MAX_BITS_IN_GROUP), DEFAULT(512), BLOCK_SIZE(1)); #else - VALID_RANGE(512, MTS_MAX_BITS_IN_GROUP), DEFAULT(512), BLOCK_SIZE(8)); + VALID_RANGE(512, MTS_MAX_BITS_IN_GROUP), DEFAULT(512), BLOCK_SIZE(1)); #endif /* DBUG_OFF */ #endif /* HAVE_REPLICATION */ No bundle (reason: useless for push emails).