From: Marc Alff Date: July 29 2011 9:56am Subject: bzr push into mysql-trunk-wl5378 branch (marc.alff:3366 to 3367) List-Archive: http://lists.mysql.com/commits/140500 Message-Id: <201107290956.p6T9ufP8003110@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3367 Marc Alff 2011-07-29 [merge] Merge mysql-trunk --> mysql-trunk-wl5378 renamed: mysql-test/suite/sys_vars/r/default_temp_storage_engine_basic.result => mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result mysql-test/suite/sys_vars/t/default_temp_storage_engine_basic.test => mysql-test/suite/sys_vars/t/default_tmp_storage_engine_basic.test modified: client/readline.cc cmake/create_initial_db.cmake.in libmysqld/emb_qcache.cc libmysqld/lib_sql.cc mysql-test/include/mix1.inc mysql-test/lib/mtr_cases.pm mysql-test/mysql-test-run.pl mysql-test/r/func_str.result mysql-test/r/func_time.result mysql-test/r/information_schema-big.result mysql-test/r/mysql_binary_mode.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/signal.result mysql-test/r/signal_demo3.result mysql-test/r/sp-big.result mysql-test/r/sp-bugs.result mysql-test/r/sp-code.result mysql-test/r/sp-error.result mysql-test/r/sp.result mysql-test/r/sp_trans.result mysql-test/r/strict.result mysql-test/r/view.result mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt mysql-test/suite/funcs_1/r/innodb_storedproc_02.result mysql-test/suite/funcs_1/r/memory_storedproc_02.result mysql-test/suite/funcs_1/r/myisam_storedproc_02.result mysql-test/suite/funcs_1/r/storedproc.result mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/rpl/r/rpl_row_sp005.result mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result mysql-test/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/r/innodb_buffer_pool_filename_basic.result mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test mysql-test/t/bootstrap-master.opt mysql-test/t/bootstrap.test mysql-test/t/ctype_utf8mb4-master.opt mysql-test/t/func_str.test mysql-test/t/func_time.test mysql-test/t/mysql_binary_mode.test mysql-test/t/sp-error.test sql/binlog.cc sql/debug_sync.cc sql/event_data_objects.cc sql/event_db_repository.cc sql/event_parse_data.cc sql/event_scheduler.cc sql/field.cc sql/field.h sql/field_conv.cc sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_cond.cc sql/handler.cc sql/item.cc sql/item_cmpfunc.cc sql/item_func.cc sql/item_geofunc.cc sql/item_strfunc.cc sql/item_subselect.cc sql/item_sum.cc sql/item_timefunc.cc sql/item_xmlfunc.cc sql/log.cc sql/log_event.cc sql/my_decimal.cc sql/mysqld.cc sql/mysqld.h sql/opt_explain.cc sql/opt_range.cc sql/partition_info.cc sql/protocol.cc sql/rpl_record.cc sql/rpl_reporting.cc sql/rpl_rli.cc sql/rpl_slave.cc sql/set_var.cc sql/sp.cc sql/sp_head.cc sql/sp_rcontext.cc sql/sp_rcontext.h sql/sql_acl.cc sql/sql_admin.cc sql/sql_alloc_error_handler.cc sql/sql_alter.cc sql/sql_audit.h sql/sql_base.cc sql/sql_base.h sql/sql_class.cc sql/sql_class.h sql/sql_db.cc sql/sql_error.cc sql/sql_error.h sql/sql_handler.cc sql/sql_insert.cc sql/sql_load.cc sql/sql_locale.cc sql/sql_parse.cc sql/sql_partition.cc sql/sql_plugin.cc sql/sql_prepare.cc sql/sql_prepare.h sql/sql_priv.h sql/sql_select.cc sql/sql_servers.cc sql/sql_show.cc sql/sql_signal.cc sql/sql_signal.h sql/sql_table.cc sql/sql_table.h sql/sql_tablespace.cc sql/sql_time.cc sql/sql_time.h sql/sql_trigger.cc sql/sql_update.cc sql/sql_view.cc sql/sql_yacc.yy sql/sys_vars.cc sql/table.cc sql/unireg.cc storage/innobase/handler/ha_innodb.cc storage/innobase/handler/handler0alter.cc storage/innobase/handler/i_s.cc storage/innobase/include/srv0srv.h storage/innobase/include/sync0sync.h storage/innobase/include/trx0sys.h storage/innobase/include/trx0sys.ic storage/innobase/include/trx0trx.h storage/innobase/include/trx0trx.ic storage/innobase/lock/lock0lock.c storage/innobase/read/read0read.c storage/innobase/row/row0ins.c storage/innobase/row/row0row.c storage/innobase/row/row0vers.c storage/innobase/srv/srv0srv.c storage/innobase/sync/sync0sync.c storage/innobase/trx/trx0i_s.c storage/innobase/trx/trx0purge.c storage/innobase/trx/trx0roll.c storage/innobase/trx/trx0rseg.c storage/innobase/trx/trx0sys.c storage/innobase/trx/trx0trx.c storage/innobase/trx/trx0undo.c unittest/gunit/test_utils.cc unittest/gunit/test_utils.h mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result mysql-test/suite/sys_vars/t/default_tmp_storage_engine_basic.test 3366 Marc Alff 2011-07-29 Improved test coverage Removed dead code added: mysql-test/suite/perfschema/r/start_server_no_account.result mysql-test/suite/perfschema/r/start_server_no_host.result mysql-test/suite/perfschema/r/start_server_no_user.result mysql-test/suite/perfschema/r/start_server_no_waits_history.result mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result mysql-test/suite/perfschema/t/start_server_no_account-master.opt mysql-test/suite/perfschema/t/start_server_no_account.test mysql-test/suite/perfschema/t/start_server_no_host-master.opt mysql-test/suite/perfschema/t/start_server_no_host.test mysql-test/suite/perfschema/t/start_server_no_user-master.opt mysql-test/suite/perfschema/t/start_server_no_user.test mysql-test/suite/perfschema/t/start_server_no_waits_history-master.opt mysql-test/suite/perfschema/t/start_server_no_waits_history.test mysql-test/suite/perfschema/t/start_server_no_waits_history_long-master.opt mysql-test/suite/perfschema/t/start_server_no_waits_history_long.test storage/perfschema/unittest/pfs_account-oom-t.cc storage/perfschema/unittest/pfs_host-oom-t.cc storage/perfschema/unittest/pfs_user-oom-t.cc modified: mysql-test/suite/perfschema/include/start_server_common.inc mysql-test/suite/perfschema/r/checksum.result mysql-test/suite/perfschema/r/start_server_innodb.result mysql-test/suite/perfschema/r/start_server_no_cond_class.result mysql-test/suite/perfschema/r/start_server_no_cond_inst.result mysql-test/suite/perfschema/r/start_server_no_file_class.result mysql-test/suite/perfschema/r/start_server_no_file_inst.result mysql-test/suite/perfschema/r/start_server_no_mutex_class.result mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result mysql-test/suite/perfschema/r/start_server_no_setup_actors.result mysql-test/suite/perfschema/r/start_server_no_setup_objects.result mysql-test/suite/perfschema/r/start_server_no_stage_class.result mysql-test/suite/perfschema/r/start_server_no_stages_history.result mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result mysql-test/suite/perfschema/r/start_server_no_statement_class.result mysql-test/suite/perfschema/r/start_server_no_statements_history.result mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result mysql-test/suite/perfschema/r/start_server_no_table_hdl.result mysql-test/suite/perfschema/r/start_server_no_table_inst.result mysql-test/suite/perfschema/r/start_server_no_thread_class.result mysql-test/suite/perfschema/r/start_server_no_thread_inst.result mysql-test/suite/perfschema/r/start_server_nothing.result mysql-test/suite/perfschema/r/start_server_off.result mysql-test/suite/perfschema/r/start_server_on.result mysql-test/suite/perfschema/t/checksum.test storage/perfschema/ha_perfschema.cc storage/perfschema/pfs_events_waits.cc storage/perfschema/pfs_instr.cc storage/perfschema/pfs_instr.h storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_instr_class.h storage/perfschema/unittest/CMakeLists.txt storage/perfschema/unittest/pfs_instr-oom-t.cc storage/perfschema/unittest/pfs_instr_class-oom-t.cc storage/perfschema/unittest/stub_pfs_global.h Diff too large for email (12438 lines, the limit is 10000). No bundle (reason: useless for push emails).