From: Marc Alff Date: May 26 2011 12:35pm Subject: bzr push into mysql-trunk-wl5342 branch (marc.alff:3370 to 3371) List-Archive: http://lists.mysql.com/commits/138206 Message-Id: <20110526123545.5D9AC2FEE2E@linux-8edv.site> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3371 Marc Alff 2011-05-26 [merge] Merge mysql-trunk --> mysql-trunk-wl5342 added: include/mysql/thread_pool_priv.h mysql-test/include/not_threadpool.inc mysql-test/r/status_bug17954.result mysql-test/suite/innodb/r/innodb-bug12552164.result mysql-test/suite/innodb/t/innodb-bug12552164.test mysql-test/suite/rpl/t/rpl_typeconv-master.opt mysql-test/t/status_bug17954.test sql/mem_root_array.h unittest/gunit/dynarray-t.cc modified: BUILD/SETUP.sh BUILD/build_mccge.sh client/mysql.cc cmake/configure.pl cmake/os/WindowsCache.cmake 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/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/lib/mtr_misc.pl mysql-test/mysql-test-run.pl mysql-test/r/func_in_all.result mysql-test/r/func_time.result mysql-test/r/group_min_max.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/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/t/disabled.def mysql-test/suite/federated/disabled.def 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/parts/inc/partition_fail_t2.inc mysql-test/suite/parts/r/partition_debug.result mysql-test/suite/parts/r/partition_debug_innodb.result mysql-test/suite/perfschema/t/no_threads.test mysql-test/suite/perfschema/t/one_thread_per_con.test mysql-test/suite/rpl/r/rpl_checksum.result mysql-test/suite/rpl/r/rpl_relayspace.result mysql-test/suite/rpl/t/disabled.def 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/disabled.def 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/disabled.def mysql-test/t/func_time.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/my_sync.c sql/debug_sync.cc sql/debug_sync.h sql/derror.cc sql/events.cc sql/field.cc sql/filesort.cc sql/filesort_utils.cc sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_partition.cc sql/handler.cc sql/item_cmpfunc.cc sql/item_create.cc sql/item_func.cc sql/item_func.h sql/item_strfunc.cc sql/item_subselect.cc sql/item_timefunc.cc 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_rli.cc sql/rpl_slave.cc sql/scheduler.cc sql/scheduler.h sql/set_var.cc sql/sp_head.cc sql/sp_head.h sql/sql_acl.cc sql/sql_array.h sql/sql_base.cc sql/sql_binlog.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_insert.cc sql/sql_parse.cc sql/sql_partition.cc sql/sql_partition_admin.cc sql/sql_plugin.cc sql/sql_prepare.cc sql/sql_reload.cc sql/sql_select.cc sql/sql_select.h sql/sql_show.cc sql/sql_table.cc sql/sql_test.cc sql/sql_test.h sql/sql_yacc.yy sql/sys_vars.cc sql/table.cc sql/uniques.cc sql/unireg.cc storage/example/ha_example.cc storage/innobase/buf/buf0buf.c storage/innobase/buf/buf0flu.c storage/innobase/dict/dict0crea.c storage/innobase/fil/fil0fil.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/i_s.cc storage/innobase/include/buf0buf.h storage/innobase/include/lock0priv.h storage/innobase/include/lock0priv.ic storage/innobase/include/os0file.h storage/innobase/include/os0file.ic storage/innobase/include/page0page.h storage/innobase/include/page0page.ic storage/innobase/include/row0row.h storage/innobase/include/row0row.ic storage/innobase/include/trx0purge.h storage/innobase/include/trx0rec.h storage/innobase/include/trx0trx.h storage/innobase/include/trx0types.h storage/innobase/include/ut0ut.h storage/innobase/lock/lock0lock.c storage/innobase/log/log0recv.c storage/innobase/os/os0file.c storage/innobase/page/page0page.c storage/innobase/que/que0que.c storage/innobase/row/row0merge.c storage/innobase/row/row0mysql.c storage/innobase/row/row0row.c storage/innobase/row/row0vers.c storage/innobase/srv/srv0conc.c storage/innobase/srv/srv0start.c storage/innobase/trx/trx0purge.c storage/innobase/trx/trx0rec.c storage/innobase/ut/ut0ut.c strings/ctype-uca.c unittest/gunit/CMakeLists.txt unittest/gunit/mdl-t.cc unittest/gunit/mdl_mytap-t.cc 3370 Marc Alff 2011-05-19 Fixed the table handle thread owner for: - partitioned tables - temporary tables used in replications in a slave modified: sql/ha_partition.cc sql/ha_partition.h sql/handler.cc sql/handler.h sql/rpl_slave.cc sql/sql_base.cc Diff too large for email (10495 lines, the limit is 10000). No bundle (reason: useless for push emails).