From: Marc Alff Date: May 18 2011 6:43pm Subject: bzr push into mysql-trunk-wl5378 branch (marc.alff:3352 to 3353) List-Archive: http://lists.mysql.com/commits/137564 Message-Id: <20110518184307.F36272FECF4@linux-8edv.site> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3353 Marc Alff 2011-05-18 [merge] Merge mysql-trunk --> mysql-trunk-wl5378 removed: mysql-test/suite/perfschema/t/pfs_upgrade_lc0.test mysql-test/suite/perfschema/t/pfs_upgrade_lc1.test mysql-test/suite/perfschema/t/pfs_upgrade_lc2.test mysql-test/suite/perfschema/t/schema_lc0.test mysql-test/suite/perfschema/t/schema_lc1.test mysql-test/suite/perfschema/t/schema_lc2.test added: mysql-test/extra/rpl_tests/rpl_temp_error.test mysql-test/lib/mtr_results.pm mysql-test/r/implicit_char_to_num_conversion.result mysql-test/suite/perfschema/r/pfs_upgrade.result mysql-test/suite/perfschema/r/schema.result mysql-test/suite/perfschema/t/pfs_upgrade.test mysql-test/suite/perfschema/t/schema.test mysql-test/suite/rpl/r/rpl_DML_error.result mysql-test/suite/rpl/t/rpl_DML_error.test mysql-test/t/implicit_char_to_num_conversion.test unittest/gunit/opt_range-t.cc unittest/gunit/test_utils.cc unittest/gunit/test_utils.h renamed: mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result => mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result.THIS mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result => mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result.THIS mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result => mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result.THIS mysql-test/suite/perfschema/r/schema_lc0.result => mysql-test/suite/perfschema/r/schema_lc0.result.THIS mysql-test/suite/perfschema/r/schema_lc1.result => mysql-test/suite/perfschema/r/schema_lc1.result.THIS mysql-test/suite/perfschema/r/schema_lc2.result => mysql-test/suite/perfschema/r/schema_lc2.result.THIS modified: .bzrignore CMakeLists.txt mysql-test/collections/default.experimental mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test mysql-test/extra/rpl_tests/check_type.inc mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.test mysql-test/extra/rpl_tests/rpl_innodb.test mysql-test/extra/rpl_tests/rpl_mixing_engines.inc mysql-test/include/wait_show_condition.inc mysql-test/lib/My/CoreDump.pm mysql-test/lib/My/Test.pm mysql-test/lib/mtr_report.pm mysql-test/mysql-test-run.pl mysql-test/r/ctype_binary.result mysql-test/r/ctype_cp1251.result mysql-test/r/ctype_latin1.result mysql-test/r/ctype_ucs.result mysql-test/r/ctype_utf8.result mysql-test/r/distinct.result mysql-test/r/explain.result mysql-test/r/having.result mysql-test/r/innodb_mysql_lock.result mysql-test/r/metadata.result mysql-test/r/read_only_innodb.result mysql-test/r/type_newdecimal.result mysql-test/r/type_ranges.result mysql-test/r/variables-big.result mysql-test/suite/binlog/r/binlog_innodb_row.result mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result mysql-test/suite/binlog/t/binlog_bug23533.test mysql-test/suite/binlog/t/binlog_innodb_row.test mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result mysql-test/suite/rpl/r/rpl_loaddatalocal.result mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_row_ignorable_event.result mysql-test/suite/rpl/r/rpl_row_mixing_engines.result mysql-test/suite/rpl/r/rpl_show_slave_hosts.result mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_stm_innodb.result mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result mysql-test/suite/rpl/r/rpl_typeconv.result mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test mysql-test/suite/rpl/t/rpl_loaddatalocal.test mysql-test/suite/rpl/t/rpl_row_ignorable_event.test mysql-test/suite/rpl/t/rpl_show_slave_hosts.test mysql-test/suite/rpl/t/rpl_typeconv.test mysql-test/t/distinct.test mysql-test/t/explain.test mysql-test/t/having.test mysql-test/t/innodb_mysql_lock.test mysql-test/t/type_newdecimal.test mysql-test/t/variables-big.test mysys/lf_alloc-pin.c mysys/thr_alarm.c packaging/WiX/ca/CMakeLists.txt packaging/WiX/create_msi.cmake.in packaging/WiX/custom_ui.wxs sql/binlog.cc sql/binlog.h sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_partition.cc sql/ha_partition.h sql/handler.cc sql/handler.h sql/item.cc sql/item_xmlfunc.cc sql/item_xmlfunc.h sql/log_event.cc sql/mysqld.cc sql/mysqld.h sql/rpl_info_file.cc sql/rpl_injector.cc sql/rpl_injector.h sql/rpl_master.cc sql/rpl_reporting.cc sql/rpl_rli.cc sql/rpl_rli.h sql/rpl_slave.cc sql/share/errmsg-utf8.txt sql/sp_head.cc sql/sql_acl.cc sql/sql_class.cc sql/sql_class.h sql/sql_delete.cc sql/sql_insert.cc sql/sql_lex.h sql/sql_load.cc sql/sql_parse.cc sql/sql_partition.h sql/sql_priv.h sql/sql_select.cc sql/sql_table.cc sql/sql_truncate.cc sql/sql_update.cc sql/sql_yacc.yy sql/sys_vars.cc sql/transaction.cc storage/innobase/handler/i_s.cc storage/perfschema/pfs.cc storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_instr_class.h storage/perfschema/pfs_setup_object.h storage/perfschema/table_setup_instruments.cc storage/perfschema/table_setup_instruments.h strings/decimal.c unittest/gunit/CMakeLists.txt unittest/gunit/item-t.cc unittest/mysys/lf-t.c 3352 Marc Alff 2011-05-09 WL#5378 PERFORMANCE SCHEMA SUMMARY BY USER / HOST Test cleanup modified: storage/perfschema/pfs_engine_table.cc storage/perfschema/unittest/pfs-t.cc storage/perfschema/unittest/pfs_instr-oom-t.cc storage/perfschema/unittest/pfs_instr-t.cc Diff too large for email (18847 lines, the limit is 10000). No bundle (reason: useless for push emails).