From: Bjorn Munch Date: December 20 2010 12:47pm Subject: bzr push into mysql-5.5-mtr branch (bjorn.munch:3130 to 3132) List-Archive: http://lists.mysql.com/commits/127293 Message-Id: <201012201247.oBKCldQi026522@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3132 Bjorn Munch 2010-12-20 [merge] null upmerge 3131 Bjorn Munch 2010-12-20 [merge] new merge from 5.5 removed: mysql-test/suite/innodb/r/innodb_bug56947.result mysql-test/suite/innodb/t/innodb_bug56947.test mysql-test/suite/sys_vars/t/max_binlog_cache_size_func-master.opt packaging/WiX/ca/CustomAction.rc added: cmake/maintainer.cmake mysql-test/include/ctype_8bit.inc mysql-test/include/ctype_czech.inc mysql-test/include/ctype_like_ignorable.inc mysql-test/include/io_thd_fault_injection.inc mysql-test/r/ctype_like_range.result mysql-test/r/partition_binlog.result mysql-test/suite/federated/federated_bug_35333.result mysql-test/suite/federated/federated_bug_35333.test mysql-test/suite/innodb/r/innodb_bug56947.result mysql-test/suite/innodb/t/innodb_bug56947.test mysql-test/suite/rpl/r/rpl_binlog_errors.result mysql-test/suite/rpl/t/rpl_binlog_errors-master.opt mysql-test/suite/rpl/t/rpl_binlog_errors.test mysql-test/suite/sys_vars/inc/binlog_stmt_cache_size_basic.inc mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_32.result mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test mysql-test/suite/sys_vars/t/max_binlog_stmt_cache_size_basic.test mysql-test/t/ctype_like_range.test mysql-test/t/partition_binlog.test renamed: mysql-test/extra/binlog_tests/innodb_stat.test => mysql-test/extra/binlog_tests/binlog_cache_stat.test mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result => mysql-test/suite/binlog/r/binlog_mixed_cache_stat.result mysql-test/suite/binlog/r/binlog_row_innodb_stat.result => mysql-test/suite/binlog/r/binlog_row_cache_stat.result mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result => mysql-test/suite/binlog/r/binlog_stm_cache_stat.result mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test => mysql-test/suite/binlog/t/binlog_mixed_cache_stat.test mysql-test/suite/binlog/t/binlog_row_innodb_stat.test => mysql-test/suite/binlog/t/binlog_row_cache_stat.test mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test => mysql-test/suite/binlog/t/binlog_stm_cache_stat.test modified: .bzrignore BUILD/build_mccge.sh CMakeLists.txt client/mysql.cc client/mysqladmin.cc client/mysqldump.c client/mysqltest.cc cmake/build_configurations/mysql_release.cmake cmake/do_abi_check.cmake cmake/dtrace.cmake cmake/mysql_version.cmake cmake/plugin.cmake cmd-line-utils/libedit/CMakeLists.txt dbug/dbug.c include/atomic/x86-gcc.h include/m_ctype.h include/my_dbug.h include/my_global.h include/my_stacktrace.h include/my_sys.h include/mysql/plugin_audit.h include/mysql/plugin_audit.h.pp include/mysys_err.h libmysqld/CMakeLists.txt mysql-test/collections/default.weekly mysql-test/collections/test-bt mysql-test/collections/test-bt-debug mysql-test/collections/test-bt-fast mysql-test/extra/binlog_tests/binlog.test mysql-test/extra/binlog_tests/binlog_insert_delayed.test mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test mysql-test/include/restart_mysqld.inc mysql-test/include/show_slave_status.inc mysql-test/r/archive.result mysql-test/r/auto_increment.result mysql-test/r/ctype_cp1251.result mysql-test/r/ctype_many.result mysql-test/r/ctype_uca.result mysql-test/r/ctype_utf16_uca.result mysql-test/r/ctype_utf32_uca.result mysql-test/r/derived.result mysql-test/r/func_gconcat.result mysql-test/r/func_group.result mysql-test/r/func_group_innodb.result mysql-test/r/func_misc.result mysql-test/r/func_str.result mysql-test/r/join_outer_innodb.result mysql-test/r/lock_multi.result mysql-test/r/mdl_sync.result mysql-test/r/merge.result mysql-test/r/multi_update.result mysql-test/r/mysql.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/plugin_auth.result mysql-test/r/plugin_not_embedded.result mysql-test/r/show_check.result mysql-test/r/variables.result mysql-test/r/view.result mysql-test/suite/binlog/r/binlog_index.result mysql-test/suite/binlog/r/binlog_innodb.result mysql-test/suite/binlog/r/binlog_max_extension.result mysql-test/suite/binlog/r/binlog_row_binlog.result mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result mysql-test/suite/binlog/r/binlog_stm_binlog.result mysql-test/suite/binlog/t/binlog_index.test mysql-test/suite/binlog/t/binlog_max_extension.test mysql-test/suite/innodb/r/innodb-autoinc.result mysql-test/suite/innodb/r/innodb_multi_update.result mysql-test/suite/innodb/t/innodb-autoinc.test mysql-test/suite/innodb/t/innodb_multi_update.test mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc mysql-test/suite/parts/inc/partition_decimal.inc mysql-test/suite/parts/inc/partition_double.inc mysql-test/suite/parts/inc/partition_float.inc mysql-test/suite/parts/r/partition_decimal_innodb.result mysql-test/suite/parts/r/partition_decimal_myisam.result mysql-test/suite/perfschema/include/privilege.inc mysql-test/suite/perfschema/r/dml_cond_instances.result mysql-test/suite/perfschema/r/dml_events_waits_current.result mysql-test/suite/perfschema/r/dml_events_waits_history.result mysql-test/suite/perfschema/r/dml_events_waits_history_long.result mysql-test/suite/perfschema/r/dml_ews_by_instance.result mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result mysql-test/suite/perfschema/r/dml_file_instances.result mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result mysql-test/suite/perfschema/r/dml_mutex_instances.result mysql-test/suite/perfschema/r/dml_rwlock_instances.result mysql-test/suite/perfschema/r/dml_threads.result mysql-test/suite/perfschema/r/misc.result mysql-test/suite/perfschema/r/myisam_file_io.result mysql-test/suite/perfschema/r/privilege.result mysql-test/suite/perfschema/r/thread_cache.result mysql-test/suite/perfschema/t/dml_cond_instances.test mysql-test/suite/perfschema/t/dml_events_waits_current.test mysql-test/suite/perfschema/t/dml_events_waits_history.test mysql-test/suite/perfschema/t/dml_events_waits_history_long.test mysql-test/suite/perfschema/t/dml_ews_by_instance.test mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test mysql-test/suite/perfschema/t/dml_file_instances.test mysql-test/suite/perfschema/t/dml_file_summary_by_event_name.test mysql-test/suite/perfschema/t/dml_file_summary_by_instance.test mysql-test/suite/perfschema/t/dml_mutex_instances.test mysql-test/suite/perfschema/t/dml_rwlock_instances.test mysql-test/suite/perfschema/t/dml_threads.test mysql-test/suite/perfschema/t/misc.test mysql-test/suite/perfschema/t/myisam_file_io.test mysql-test/suite/perfschema/t/thread_cache.test mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.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_insert_delayed.result mysql-test/t/archive.test mysql-test/t/auto_increment.test mysql-test/t/ctype_cp1251.test mysql-test/t/ctype_many.test mysql-test/t/ctype_uca.test mysql-test/t/ctype_utf16_uca.test mysql-test/t/ctype_utf32_uca.test mysql-test/t/derived.test mysql-test/t/func_gconcat.test mysql-test/t/func_group.test mysql-test/t/func_group_innodb.test mysql-test/t/func_misc.test mysql-test/t/func_str.test mysql-test/t/join_outer_innodb.test mysql-test/t/multi_update.test mysql-test/t/mysql.test mysql-test/t/partition_innodb.test mysql-test/t/plugin_auth.test mysql-test/t/plugin_not_embedded.test mysql-test/t/variables.test mysql-test/t/view.test mysql-test/valgrind.supp mysys/errors.c mysys/mf_pack.c mysys/my_init.c mysys/my_seek.c mysys/my_symlink.c mysys/stacktrace.c packaging/WiX/ca/CMakeLists.txt sql/ha_partition.cc sql/ha_partition.h sql/handler.cc sql/item.cc sql/item_cmpfunc.cc sql/item_create.cc sql/item_func.cc sql/item_row.cc sql/item_strfunc.cc sql/item_strfunc.h sql/item_subselect.cc sql/item_subselect.h sql/item_sum.cc sql/item_sum.h sql/log.cc 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_injector.cc sql/share/charsets/cp1251.xml sql/share/errmsg-utf8.txt sql/slave.cc sql/slave.h sql/sp_head.cc sql/sql_audit.cc sql/sql_audit.h sql/sql_base.cc sql/sql_binlog.cc sql/sql_class.cc sql/sql_class.h sql/sql_connect.cc sql/sql_cursor.cc sql/sql_db.cc sql/sql_derived.cc sql/sql_derived.h sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_load.cc sql/sql_parse.cc sql/sql_partition_admin.cc sql/sql_plugin.cc sql/sql_plugin.h sql/sql_prepare.cc sql/sql_priv.h sql/sql_reload.cc sql/sql_reload.h sql/sql_repl.cc sql/sql_select.cc sql/sql_show.cc sql/sql_udf.cc sql/sql_update.cc sql/sql_view.cc sql/sys_vars.cc storage/archive/ha_archive.cc storage/innobase/row/row0mysql.c storage/myisam/mi_check.c storage/perfschema/ha_perfschema.cc storage/perfschema/ha_perfschema.h storage/perfschema/pfs_engine_table.cc storage/perfschema/table_setup_consumers.cc storage/perfschema/table_setup_instruments.cc storage/perfschema/table_setup_timers.cc strings/CHARSET_INFO.txt strings/ctype-extra.c strings/ctype-mb.c strings/ctype-uca.c strings/ctype-ucs2.c strings/my_strchr.c mysql-test/extra/binlog_tests/binlog_cache_stat.test mysql-test/suite/binlog/r/binlog_mixed_cache_stat.result mysql-test/suite/binlog/r/binlog_row_cache_stat.result mysql-test/suite/binlog/r/binlog_stm_cache_stat.result mysql-test/suite/binlog/t/binlog_mixed_cache_stat.test mysql-test/suite/binlog/t/binlog_row_cache_stat.test mysql-test/suite/binlog/t/binlog_stm_cache_stat.test 3130 Bjorn Munch 2010-12-17 some more if stmt simplifications modified: mysql-test/extra/rpl_tests/rpl_stop_slave.test mysql-test/include/check_ftwrl_compatible.inc mysql-test/include/check_ftwrl_incompatible.inc mysql-test/include/show_slave_status.inc mysql-test/suite/innodb/t/innodb_bug42419.test Diff too large for email (16015 lines, the limit is 10000). No bundle (reason: useless for push emails).