3277 cpowers 2011-04-02
WL#4896 "Performance Schema Net IO"
- Fixed initialization error discovered by unit testing
- Corrected merge errors in unit test code
modified:
storage/perfschema/pfs.cc
storage/perfschema/unittest/pfs-t.cc
3276 cpowers 2011-04-01 [merge]
merge with mysql-trunk
removed:
include/my_handler.h
mysys/my_gethostbyname.c
mysys/my_handler.c
mysys/my_port.c
storage/innobase/include/thr0loc.h
storage/innobase/include/thr0loc.ic
storage/innobase/thr/
storage/innobase/thr/thr0loc.c
added:
include/my_compare.h
mysys/my_compare.c
modified:
client/mysqlbinlog.cc
extra/perror.c
extra/yassl/include/cert_wrapper.hpp
extra/yassl/include/openssl/prefix_ssl.h
extra/yassl/include/openssl/ssl.h
extra/yassl/include/yassl_int.hpp
extra/yassl/src/cert_wrapper.cpp
extra/yassl/src/ssl.cpp
extra/yassl/src/yassl_int.cpp
extra/yassl/taocrypt/include/asn.hpp
extra/yassl/taocrypt/src/asn.cpp
include/heap.h
include/my_global.h
include/my_net.h
include/myisam.h
mysql-test/extra/rpl_tests/rpl_deadlock.test
mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
mysql-test/extra/rpl_tests/rpl_stop_middle_group.test
mysql-test/include/subquery_sj.inc
mysql-test/r/func_time.result
mysql-test/r/innodb_icp_all.result
mysql-test/r/join_cache_jcl5.result
mysql-test/r/join_cache_jcl6.result
mysql-test/r/join_cache_jcl7.result
mysql-test/r/join_cache_jcl8.result
mysql-test/r/myisam_icp_all.result
mysql-test/r/order_by_icp_mrr.result
mysql-test/r/order_by_none.result
mysql-test/r/ssl.result
mysql-test/r/subquery_mat_all.result
mysql-test/r/subquery_sj_all.result
mysql-test/r/subquery_sj_all_jcl6.result
mysql-test/r/subquery_sj_all_jcl7.result
mysql-test/r/subquery_sj_dupsweed.result
mysql-test/r/subquery_sj_dupsweed_jcl6.result
mysql-test/r/subquery_sj_dupsweed_jcl7.result
mysql-test/r/subquery_sj_firstmatch.result
mysql-test/r/subquery_sj_firstmatch_jcl6.result
mysql-test/r/subquery_sj_firstmatch_jcl7.result
mysql-test/r/subquery_sj_innodb_all.result
mysql-test/r/subquery_sj_innodb_all_jcl6.result
mysql-test/r/subquery_sj_innodb_all_jcl7.result
mysql-test/r/subquery_sj_loosescan.result
mysql-test/r/subquery_sj_loosescan_jcl6.result
mysql-test/r/subquery_sj_loosescan_jcl7.result
mysql-test/r/subquery_sj_mat.result
mysql-test/r/subquery_sj_mat_jcl6.result
mysql-test/r/subquery_sj_mat_jcl7.result
mysql-test/r/subquery_sj_mat_nosj.result
mysql-test/r/subquery_sj_none.result
mysql-test/r/subquery_sj_none_jcl6.result
mysql-test/r/subquery_sj_none_jcl7.result
mysql-test/suite/innodb/include/innodb_stats.inc
mysql-test/suite/innodb/r/innodb_stats.result
mysql-test/suite/rpl/r/rpl_corruption.result
mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
mysql-test/suite/rpl/r/rpl_init_slave_errors.result
mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result
mysql-test/suite/rpl/t/rpl_corruption.test
mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
mysql-test/suite/rpl/t/rpl_init_slave_errors.test
mysql-test/suite/rpl/t/rpl_show_slave_running.test
mysql-test/t/func_time.test
mysql-test/t/ssl.test
mysys/CMakeLists.txt
mysys/my_handler_errors.h
sql/handler.h
sql/item.cc
sql/item_sum.cc
sql/item_timefunc.h
sql/mysqld.cc
sql/opt_range.cc
sql/opt_range.h
sql/rpl_reporting.cc
sql/rpl_reporting.h
sql/rpl_slave.cc
sql/sql_lex.cc
sql/sql_parse.cc
sql/sql_select.cc
sql/sql_table.cc
sql/sql_update.cc
sql/table.h
storage/innobase/CMakeLists.txt
storage/innobase/btr/btr0cur.c
storage/innobase/buf/buf0buddy.c
storage/innobase/buf/buf0buf.c
storage/innobase/buf/buf0flu.c
storage/innobase/buf/buf0rea.c
storage/innobase/data/data0data.c
storage/innobase/dict/dict0boot.c
storage/innobase/dict/dict0crea.c
storage/innobase/dict/dict0dict.c
storage/innobase/dict/dict0load.c
storage/innobase/dict/dict0mem.c
storage/innobase/dict/dict0stats.c
storage/innobase/fil/fil0fil.c
storage/innobase/fsp/fsp0fsp.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/i_s.cc
storage/innobase/ibuf/ibuf0ibuf.c
storage/innobase/include/btr0pcur.h
storage/innobase/include/btr0pcur.ic
storage/innobase/include/buf0buf.h
storage/innobase/include/buf0buf.ic
storage/innobase/include/buf0flu.ic
storage/innobase/include/buf0rea.h
storage/innobase/include/dict0dict.ic
storage/innobase/include/dict0mem.h
storage/innobase/include/ibuf0ibuf.h
storage/innobase/include/ibuf0ibuf.ic
storage/innobase/include/mtr0mtr.h
storage/innobase/include/mtr0mtr.ic
storage/innobase/include/page0page.h
storage/innobase/include/page0types.h
storage/innobase/include/page0zip.ic
storage/innobase/include/rem0rec.h
storage/innobase/include/rem0rec.ic
storage/innobase/include/srv0srv.h
storage/innobase/include/sync0sync.h
storage/innobase/include/univ.i
storage/innobase/lock/lock0lock.c
storage/innobase/mtr/mtr0log.c
storage/innobase/mtr/mtr0mtr.c
storage/innobase/page/page0page.c
storage/innobase/page/page0zip.c
storage/innobase/pars/pars0pars.c
storage/innobase/row/row0ext.c
storage/innobase/row/row0merge.c
storage/innobase/row/row0mysql.c
storage/innobase/row/row0row.c
storage/innobase/row/row0sel.c
storage/innobase/row/row0umod.c
storage/innobase/row/row0undo.c
storage/innobase/row/row0upd.c
storage/innobase/srv/srv0srv.c
storage/innobase/srv/srv0start.c
storage/innobase/trx/trx0i_s.c
storage/innobase/trx/trx0rec.c
storage/innobase/trx/trx0sys.c
storage/innobase/trx/trx0trx.c
storage/myisam/ft_stopwords.c
storage/myisam/mi_check.c
storage/myisam/mi_range.c
=== modified file 'storage/perfschema/pfs.cc'
--- a/storage/perfschema/pfs.cc 2011-04-01 22:04:26 +0000
+++ b/storage/perfschema/pfs.cc 2011-04-02 21:08:06 +0000
@@ -2860,6 +2860,8 @@ get_thread_socket_locker_v1(PSI_socket_l
}
else
{
+ flags= 0;
+
/*
get_thread_socket_locker() does not track the byte count associated
with socket operations because the requested and actual byte counts
=== modified file 'storage/perfschema/unittest/pfs-t.cc'
--- a/storage/perfschema/unittest/pfs-t.cc 2011-03-28 20:15:26 +0000
+++ b/storage/perfschema/unittest/pfs-t.cc 2011-04-02 21:08:06 +0000
@@ -1183,7 +1183,7 @@ void test_locker_disabled()
socket_locker= psi->get_thread_socket_locker(&socket_state, socket_A1, PSI_SOCKET_SEND);
ok(socket_locker == NULL, "no locker (global disabled)");
- /* Pretent the mode is global, counted only */
+ /* Pretend the mode is global, counted only */
/* ---------------------------------------- */
setup_thread(thread_1, true);
@@ -1218,7 +1218,8 @@ void test_locker_disabled()
ok(file_locker != NULL, "locker (global counted)");
psi->start_file_wait(file_locker, 10, __FILE__, __LINE__);
psi->end_file_wait(file_locker, 10);
- socket_locker= psi->get_thread_socket_locker(&socket_state, socket_A1, PSI_SOCKET_SEND);
+ /* The null locker shortcut applies only to socket ops with no byte count */
+ socket_locker= psi->get_thread_socket_locker(&socket_state, socket_A1, PSI_SOCKET_BIND);
ok(socket_locker == NULL, "no locker (global counted)");
/* TODO */
@@ -1567,10 +1568,6 @@ void test_event_name_index()
ok(file_class != NULL, "file class 2");
ok(file_class->m_event_name_index == 71, "index 71");
- ok(global_table_io_class.m_event_name_index == 150, "index 150");
- ok(global_table_lock_class.m_event_name_index == 151, "index 151");
- ok(wait_class_max= 152, "152 event names");
-
PFS_socket_class *socket_class;
PSI_socket_key dummy_socket_key_1;
PSI_socket_key dummy_socket_key_2;
@@ -1589,6 +1586,7 @@ void test_event_name_index()
ok(socket_class->m_event_name_index == 151, "index 151");
ok(global_table_io_class.m_event_name_index == 310, "index 310");
+ ok(global_table_lock_class.m_event_name_index == 311, "index 311");
ok(wait_class_max= 313, "313 event names"); // 3 global classes
}
@@ -1606,7 +1604,7 @@ void do_all_tests()
int main(int, char **)
{
- plan(213);
+ plan(214);
MY_INIT("pfs-t");
do_all_tests();
return 0;
Attachment: [text/bzr-bundle] bzr/cpowers@tma-1-20110402210806-ub1qi3clj36p3mmr.bundle
| Thread |
|---|
| • bzr push into mysql-trunk branch (chris.powers:3276 to 3277) WL#4896 | Christopher Powers | 2 Apr |
