From: Marc Alff Date: August 17 2011 8:56pm Subject: bzr push into mysql-trunk branch (marc.alff:3372 to 3373) List-Archive: http://lists.mysql.com/commits/140689 Message-Id: <201108172057.p7HKv3FW006172@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3373 Marc Alff 2011-08-17 [merge] Merge mysql-trunk --> mysql-trunk-wl4896 added: mysql-test/r/optimizer_bug12837084.result mysql-test/suite/innodb/r/innodb_corrupt_bit.result mysql-test/suite/innodb/t/innodb_corrupt_bit.test mysql-test/suite/sys_vars/r/ignore_db_dirs_basic.result mysql-test/suite/sys_vars/r/innodb_force_load_corrupted_basic.result mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result mysql-test/suite/sys_vars/t/ignore_db_dirs_basic-master.opt mysql-test/suite/sys_vars/t/ignore_db_dirs_basic.test mysql-test/suite/sys_vars/t/innodb_force_load_corrupted_basic.test mysql-test/suite/sys_vars/t/innodb_large_prefix_basic.test mysql-test/t/optimizer_bug12837084.test modified: include/my_base.h mysql-test/collections/default.experimental mysql-test/r/derived.result mysql-test/r/explain.result mysql-test/r/func_gconcat.result mysql-test/r/grant2.result mysql-test/r/heap.result mysql-test/r/index_merge_myisam.result mysql-test/r/information_schema.result mysql-test/r/innodb_explain_non_select_none.result mysql-test/r/myisam_explain_non_select_none.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/row.result mysql-test/r/subquery_all.result mysql-test/r/subquery_nomat_nosj.result mysql-test/r/subquery_none.result mysql-test/r/view.result mysql-test/suite/funcs_1/datadict/datadict_priv.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/innodb/r/innodb_mysql.result mysql-test/suite/opt_trace/r/bugs_no_prot_none.result mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result mysql-test/suite/opt_trace/r/charset.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/general_no_prot_none.result mysql-test/suite/opt_trace/r/general_ps_prot_none.result mysql-test/suite/opt_trace/r/range_no_prot.result mysql-test/suite/opt_trace/r/range_ps_prot.result mysql-test/suite/opt_trace/r/security_no_prot.result mysql-test/suite/opt_trace/r/security_ps_prot.result mysql-test/suite/rpl/r/rpl_heartbeat.result mysql-test/suite/rpl/t/rpl_heartbeat.test mysql-test/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test mysql-test/t/derived.test mysql-test/t/grant2.test mysql-test/t/heap.test mysql-test/t/join.test mysys/my_handler_errors.h sql/authors.h sql/field.h sql/handler.cc sql/item_cmpfunc.cc sql/item_subselect.cc sql/item_sum.cc sql/key.h sql/mysqld.cc sql/mysqld.h sql/opt_explain.cc sql/opt_range.cc sql/opt_range.h sql/opt_sum.cc sql/records.cc sql/records.h sql/share/errmsg-utf8.txt sql/sql_alter.cc sql/sql_base.cc sql/sql_class.cc sql/sql_class.h sql/sql_cursor.cc sql/sql_derived.cc sql/sql_derived.h sql/sql_insert.cc sql/sql_join_cache.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_list.h sql/sql_parse.cc sql/sql_prepare.cc sql/sql_select.cc sql/sql_select.h sql/sql_show.cc sql/sql_show.h sql/sql_union.cc sql/sql_update.cc sql/sql_view.cc sql/structs.h sql/sys_vars.cc sql/table.cc sql/table.h storage/heap/hp_hash.c storage/innobase/buf/buf0buf.c storage/innobase/buf/buf0lru.c storage/innobase/dict/dict0dict.c storage/innobase/dict/dict0load.c storage/innobase/handler/ha_innodb.cc storage/innobase/include/buf0lru.h storage/innobase/include/db0err.h storage/innobase/include/dict0boot.h storage/innobase/include/dict0dict.h storage/innobase/include/dict0dict.ic storage/innobase/include/dict0mem.h storage/innobase/include/dict0priv.ic storage/innobase/include/dict0types.h storage/innobase/include/srv0srv.h storage/innobase/include/trx0sys.h storage/innobase/pars/pars0opt.c storage/innobase/row/row0ins.c storage/innobase/row/row0merge.c storage/innobase/row/row0mysql.c storage/innobase/row/row0purge.c storage/innobase/row/row0sel.c storage/innobase/row/row0uins.c storage/innobase/row/row0umod.c storage/innobase/row/row0upd.c storage/innobase/ut/ut0ut.c unittest/gunit/sql_list-t.cc 3372 Marc Alff 2011-08-17 Misc cleanup modified: mysql-test/include/mtr_check.sql mysql-test/suite/perfschema/r/socket_instances_func_win.result* mysql-test/suite/perfschema/t/disabled.def* mysql-test/suite/perfschema/t/socket_connect.test mysql-test/suite/perfschema/t/socket_instances_func-master.opt* mysql-test/suite/perfschema/t/socket_instances_func.test* mysql-test/suite/perfschema/t/socket_instances_func_win-master.opt* mysql-test/suite/perfschema/t/socket_instances_func_win.test* mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test* mysql-test/suite/perfschema/t/socket_summary_by_instance_func_dbg.test* storage/perfschema/CMakeLists.txt* storage/perfschema/pfs.cc* storage/perfschema/table_socket_instances.cc Diff too large for email (14039 lines, the limit is 10000). No bundle (reason: useless for push emails).