From: MySQL Release Engineering Date: August 13 2012 5:49pm Subject: bzr push into mysql-5.5 branch (mysql-re_ww_grp:3656 to 3657) List-Archive: http://lists.mysql.com/commits/144548 Message-Id: <20120813174910.21157.5968.3657@helheim.no.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3657 hery.ramilison@stripped 2012-08-13 applying patch for br14476891 modified: VERSION include/mysql/thread_pool_priv.h sql/sql_class.cc 3656 chuck.bell@stripped 2012-01-30 {clone-5.5.21-build} [merge] Merge with main for BUG#12969301 added: mysql-test/suite/innodb/r/innodb_bug12400341.result mysql-test/suite/innodb/t/innodb_bug12400341-master.opt mysql-test/suite/innodb/t/innodb_bug12400341.test mysql-test/suite/rpl/r/rpl_start_stop_slave.result mysql-test/suite/rpl/t/rpl_start_stop_slave.test mysql-test/suite/sys_vars/r/innodb_change_buffering_debug_basic.result mysql-test/suite/sys_vars/r/innodb_trx_rseg_n_slots_debug_basic.result mysql-test/suite/sys_vars/r/stored_program_cache_basic.result mysql-test/suite/sys_vars/t/innodb_change_buffering_debug_basic.test mysql-test/suite/sys_vars/t/innodb_trx_rseg_n_slots_debug_basic.test mysql-test/suite/sys_vars/t/stored_program_cache_basic.test modified: CMakeLists.txt VERSION client/mysql_upgrade.c client/mysqldump.c cmd-line-utils/libedit/chartype.h cmd-line-utils/libedit/eln.c cmd-line-utils/libedit/readline.c include/m_ctype.h include/my_global.h libmysql/CMakeLists.txt mysql-test/collections/default.experimental mysql-test/extra/rpl_tests/rpl_extra_col_master.test mysql-test/extra/rpl_tests/rpl_start_stop_slave.test mysql-test/include/have_example_plugin.inc mysql-test/include/have_semisync_plugin.inc mysql-test/include/have_simple_parser.inc mysql-test/include/have_udf.inc mysql-test/include/show_slave_status.inc mysql-test/include/wait_for_ndb_to_binlog.inc mysql-test/include/wait_for_slave_io_error.inc mysql-test/r/bigint.result mysql-test/r/ctype_utf8.result mysql-test/r/func_in.result mysql-test/r/func_str.result mysql-test/r/func_time.result mysql-test/r/init_connect.result mysql-test/r/key_cache.result mysql-test/r/mysqlcheck.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/mysqldump.result mysql-test/r/partition_binlog_stmt.result mysql-test/r/partition_key_cache.result mysql-test/r/range.result mysql-test/r/sp.result mysql-test/r/xa.result mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result mysql-test/suite/rpl/r/rpl_heartbeat_basic.result mysql-test/suite/rpl/r/rpl_known_bugs_detection.result mysql-test/suite/rpl/r/rpl_log_pos.result mysql-test/suite/rpl/r/rpl_manual_change_index_file.result mysql-test/suite/rpl/r/rpl_packet.result mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test mysql-test/suite/rpl/t/rpl_heartbeat_basic.test mysql-test/suite/rpl/t/rpl_known_bugs_detection.test mysql-test/suite/rpl/t/rpl_log_pos.test mysql-test/suite/rpl/t/rpl_manual_change_index_file.test mysql-test/suite/rpl/t/rpl_packet.test mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test mysql-test/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/r/character_sets_dir_basic.result mysql-test/suite/sys_vars/r/plugin_dir_basic.result mysql-test/suite/sys_vars/t/all_vars.test mysql-test/suite/sys_vars/t/character_sets_dir_basic.test mysql-test/suite/sys_vars/t/disabled.def mysql-test/t/bigint.test mysql-test/t/ctype_utf8.test mysql-test/t/func_str.test mysql-test/t/func_time.test mysql-test/t/init_connect.test mysql-test/t/key_cache.test mysql-test/t/mysqlcheck.test mysql-test/t/mysqldump.test mysql-test/t/partition_binlog_stmt.test mysql-test/t/partition_key_cache.test mysql-test/t/range.test mysql-test/t/sp.test mysql-test/t/udf_skip_grants-master.opt mysql-test/t/xa.test mysys/charset-def.c scripts/mysqld_safe.sh sql-common/my_time.c sql/item.cc sql/item_cmpfunc.cc sql/item_timefunc.cc sql/log_event.h sql/mysqld.cc sql/mysqld.h sql/rpl_mi.cc sql/rpl_mi.h sql/rpl_rli.cc sql/rpl_rli.h sql/share/errmsg-utf8.txt sql/slave.cc sql/sp_cache.cc sql/sp_cache.h sql/sql_admin.cc sql/sql_connect.cc sql/sql_parse.cc sql/sql_plugin.cc sql/sql_prepare.cc sql/sql_repl.cc sql/sql_udf.cc sql/sys_vars.cc storage/federated/ha_federated.cc storage/innobase/btr/btr0btr.c storage/innobase/btr/btr0cur.c storage/innobase/btr/btr0pcur.c storage/innobase/buf/buf0buf.c storage/innobase/dict/dict0load.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/innobase/handler/handler0alter.cc storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/btr0btr.h storage/innobase/include/btr0pcur.h storage/innobase/include/data0data.h storage/innobase/include/data0data.ic storage/innobase/include/mem0mem.ic storage/innobase/include/mtr0log.ic storage/innobase/include/row0mysql.h storage/innobase/include/row0sel.h storage/innobase/include/trx0rseg.ic storage/innobase/include/trx0sys.h storage/innobase/include/univ.i storage/innobase/include/ut0mem.h storage/innobase/include/ut0rnd.ic storage/innobase/lock/lock0lock.c storage/innobase/mem/mem0pool.c storage/innobase/os/os0file.c storage/innobase/os/os0proc.c storage/innobase/page/page0page.c storage/innobase/pars/pars0pars.c storage/innobase/row/row0ins.c storage/innobase/row/row0mysql.c storage/innobase/row/row0sel.c storage/innobase/row/row0umod.c storage/innobase/row/row0upd.c storage/innobase/srv/srv0srv.c storage/innobase/trx/trx0purge.c storage/innobase/trx/trx0rec.c storage/innobase/trx/trx0sys.c storage/innobase/ut/ut0mem.c storage/myisam/mi_preload.c strings/ctype-ucs2.c strings/ctype-utf8.c strings/dtoa.c === modified file 'VERSION' --- a/VERSION 2012-01-11 17:50:47 +0000 +++ b/VERSION 2012-08-13 17:47:46 +0000 @@ -1,4 +1,4 @@ MYSQL_VERSION_MAJOR=5 MYSQL_VERSION_MINOR=5 MYSQL_VERSION_PATCH=21 -MYSQL_VERSION_EXTRA= +MYSQL_VERSION_EXTRA=SR5931858071 === modified file 'include/mysql/thread_pool_priv.h' --- a/include/mysql/thread_pool_priv.h 2011-06-30 15:46:53 +0000 +++ b/include/mysql/thread_pool_priv.h 2012-08-13 17:47:46 +0000 @@ -35,6 +35,7 @@ #include #include #include +#include /* Needed to get access to scheduler variables */ void* thd_get_scheduler_data(THD *thd); @@ -56,9 +57,30 @@ void thd_unlock_data(THD *thd); bool thd_is_transaction_active(THD *thd); int thd_connection_has_data(THD *thd); void thd_set_net_read_write(THD *thd, uint val); +uint thd_get_net_read_write(THD *thd); void thd_set_mysys_var(THD *thd, st_my_thread_var *mysys_var); +ulong thd_get_net_wait_timeout(THD *thd); my_socket thd_get_fd(THD *thd); +/* Interface class for global thread list iteration */ +class Thread_iterator +{ + public: + Thread_iterator() : m_iterator(threads) {} + THD* next() + { + THD* tmp = m_iterator++; + return tmp; + } + private: + /* + Don't allow copying of this class. + */ + Thread_iterator(const Thread_iterator&); + void operator=(const Thread_iterator&); + I_List_iterator m_iterator; +}; + /* Print to the MySQL error log */ void sql_print_error(const char *format, ...); === modified file 'sql/sql_class.cc' --- a/sql/sql_class.cc 2011-12-14 13:33:43 +0000 +++ b/sql/sql_class.cc 2012-08-13 17:47:46 +0000 @@ -255,6 +255,18 @@ PSI_thread *thd_get_psi(THD *thd) } /** + Get net_wait_timeout for THD object + + @param thd THD object + + @retval net_wait_timeout value for thread on THD +*/ +ulong thd_get_net_wait_timeout(THD* thd) +{ + return thd->variables.net_wait_timeout; +} + +/** Set reference to Performance Schema object for THD object @param thd THD object @@ -423,6 +435,17 @@ void thd_set_net_read_write(THD *thd, ui } /** + Get reading/writing on socket from THD object + @param thd THD object + + @retval net.reading_or_writing value for thread on THD. +*/ +uint thd_get_net_read_write(THD *thd) +{ + return thd->net.reading_or_writing; +} + +/** Set reference to mysys variable in THD object @param thd THD object No bundle (reason: useless for push emails).