From: Bjorn Munch Date: May 20 2011 11:07am Subject: bzr commit into mysql-trunk-mtr branch (bjorn.munch:3077) List-Archive: http://lists.mysql.com/commits/137776 Message-Id: <201105201107.p4KB7TSi029571@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/bm136801/my/mtr-tr/ based on revid:bjorn.munch@stripped 3077 Bjorn Munch 2011-05-20 [merge] merge from trunk removed: mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result mysql-test/suite/perfschema/r/schema_lc0.result mysql-test/suite/perfschema/r/schema_lc1.result mysql-test/suite/perfschema/r/schema_lc2.result 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: include/mysql/thread_pool_priv.h include/probes_mysql_nodtrace.h mysql-test/extra/rpl_tests/rpl_temp_error.test mysql-test/include/not_threadpool.inc mysql-test/r/implicit_char_to_num_conversion.result mysql-test/r/status_bug17954.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 mysql-test/t/status_bug17954.test sql/mem_root_array.h unittest/gunit/dynarray-t.cc unittest/gunit/opt_range-t.cc unittest/gunit/test_utils.cc unittest/gunit/test_utils.h modified: .bzrignore BUILD/build_mccge.sh CMakeLists.txt client/mysql.cc include/my_compiler.h include/my_sys.h include/mysql/plugin_audit.h.pp include/mysql/plugin_auth.h.pp include/mysql/plugin_ftparser.h.pp include/mysql/service_thd_wait.h libmysqld/lib_sql.cc mysql-test/collections/default.experimental mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test 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/have_archive_plugin.inc mysql-test/include/have_blackhole_plugin.inc mysql-test/include/mrr_tests.inc mysql-test/include/plugin.defs mysql-test/include/range.inc mysql-test/include/subquery.inc mysql-test/r/func_in_all.result mysql-test/r/func_time.result mysql-test/r/group_min_max.result mysql-test/r/having.result mysql-test/r/innodb_mrr.result mysql-test/r/innodb_mrr_all.result mysql-test/r/innodb_mrr_cost.result mysql-test/r/innodb_mrr_cost_all.result mysql-test/r/innodb_mrr_cost_icp.result mysql-test/r/innodb_mrr_icp.result mysql-test/r/innodb_mrr_none.result mysql-test/r/myisam_mrr.result mysql-test/r/myisam_mrr_all.result mysql-test/r/myisam_mrr_cost.result mysql-test/r/myisam_mrr_cost_all.result mysql-test/r/myisam_mrr_cost_icp.result mysql-test/r/myisam_mrr_icp.result mysql-test/r/myisam_mrr_none.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/read_only_innodb.result mysql-test/r/status.result mysql-test/r/subquery_all.result mysql-test/r/subquery_all_jcl6.result mysql-test/r/subquery_nomat_nosj.result mysql-test/r/subquery_nomat_nosj_jcl6.result mysql-test/r/subquery_none.result mysql-test/r/subquery_none_jcl6.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_innodb_row.test mysql-test/suite/innodb/r/innodb-index.result mysql-test/suite/innodb/r/innodb.result mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/innodb/t/innodb-index.test mysql-test/suite/innodb/t/innodb.test mysql-test/suite/innodb/t/innodb_mysql.test mysql-test/suite/perfschema/t/no_threads.test mysql-test/suite/perfschema/t/one_thread_per_con.test mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result mysql-test/suite/rpl/r/rpl_checksum.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_relayspace.result mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_row_mixing_engines.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/t/rpl_begin_commit_rollback.test mysql-test/suite/rpl/t/rpl_checksum.test mysql-test/suite/rpl/t/rpl_relayspace.test mysql-test/suite/sys_vars/t/all_vars.test mysql-test/suite/sys_vars/t/slow_launch_time_func.test mysql-test/suite/sys_vars/t/thread_cache_size_func.test mysql-test/suite/sys_vars/t/wait_timeout_func.test mysql-test/t/func_time.test mysql-test/t/having.test mysql-test/t/information_schema.test mysql-test/t/information_schema_db.test mysql-test/t/kill.test mysql-test/t/mysqlshow.test mysql-test/t/named_pipe.test mysql-test/t/no-threads.test mysql-test/t/shm.test mysql-test/t/status.test mysys/lf_alloc-pin.c mysys/my_sync.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/debug_sync.cc sql/debug_sync.h sql/filesort.cc sql/filesort_utils.cc 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_cmpfunc.cc sql/item_func.cc sql/item_func.h sql/item_timefunc.cc sql/item_xmlfunc.cc sql/item_xmlfunc.h sql/log.cc sql/log.h sql/log_event.cc sql/mdl.cc sql/mysqld.cc sql/mysqld.h sql/opt_range.cc 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/scheduler.cc sql/scheduler.h sql/share/errmsg-utf8.txt sql/sp_head.cc sql/sp_head.h sql/sql_acl.cc sql/sql_class.cc sql/sql_class.h sql/sql_connect.cc sql/sql_connect.h sql/sql_const.h sql/sql_cursor.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_prepare.cc sql/sql_priv.h sql/sql_select.cc sql/sql_select.h sql/sql_table.cc sql/sql_test.cc sql/sql_test.h sql/sql_truncate.cc sql/sql_update.cc sql/sys_vars.cc sql/table.cc sql/transaction.cc sql/uniques.cc storage/innobase/handler/i_s.cc storage/innobase/srv/srv0conc.c 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/gunit/mdl-t.cc unittest/gunit/mdl_mytap-t.cc unittest/mysys/lf-t.c Diff too large for email (25407 lines, the limit is 10000). No bundle (reason: revision is a merge).