From: Christopher Powers Date: August 16 2011 3:12pm Subject: bzr push into mysql-trunk branch (chris.powers:3369 to 3370) WL#4896 List-Archive: http://lists.mysql.com/commits/140656 Message-Id: <201108161512.p7GFCwO8018496@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3370 Christopher Powers 2011-08-16 WL#4896 "Performance Schema Net IO" - Build break abi_check.out - chmod -x for new .inc files removed: mysql-test/suite/perfschema/r/socket_summary_by_instance_func_dbg.result modified: include/mysql/psi/psi_abi_v1.h.pp mysql-test/suite/perfschema/include/socket_event_dbg.inc* mysql-test/suite/perfschema/include/socket_summary_check.inc* mysql-test/suite/perfschema/include/socket_summary_check_dbg.inc* 3369 Christopher Powers 2011-08-15 [merge] WL#4896 "Performance Schema Net IO" Local merge with mysql-trunk removed: mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result.THIS mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result.THIS mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result.THIS mysql-test/suite/perfschema/r/schema_lc0.result.THIS mysql-test/suite/perfschema/r/schema_lc1.result.THIS mysql-test/suite/perfschema/r/schema_lc2.result.THIS added: client/mysql_plugin.c mysql-test/include/daemon_example_bad_format.ini mysql-test/include/daemon_example_bad_soname.ini mysql-test/r/mysql_plugin.result mysql-test/suite/innodb/r/innodb_bug59733.result mysql-test/suite/innodb/t/innodb_bug59733.test mysql-test/t/mysql_plugin-master.opt mysql-test/t/mysql_plugin.test plugin/daemon_example/daemon_example.ini modified: client/CMakeLists.txt include/my_global.h mysql-test/include/join_cache.inc mysql-test/include/plugin.defs mysql-test/include/range.inc mysql-test/mysql-test-run.pl mysql-test/r/group_by.result mysql-test/r/information_schema.result mysql-test/r/innodb_icp_all.result mysql-test/r/innodb_mrr_all.result mysql-test/r/innodb_mrr_cost_all.result mysql-test/r/join_cache_jcl0.result mysql-test/r/join_cache_jcl1.result mysql-test/r/join_cache_jcl2.result mysql-test/r/join_cache_jcl3.result mysql-test/r/join_cache_jcl4.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/myisam_mrr_all.result mysql-test/r/myisam_mrr_cost_all.result mysql-test/r/range_all.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/sp_trans.result mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test mysql-test/t/group_by.test mysql-test/t/information_schema.test mysql-test/t/sp_trans.test plugin/daemon_example/CMakeLists.txt sql/field.h sql/handler.cc sql/handler.h sql/mysqld.cc sql/opt_range.cc sql/sql_class.cc sql/sql_class.h sql/sql_join_cache.cc sql/sql_parse.cc sql/sql_select.cc sql/sql_select.h sql/sql_show.cc sql/sql_test.cc sql/sql_yacc.yy storage/innobase/btr/btr0btr.c storage/innobase/btr/btr0cur.c storage/innobase/btr/btr0pcur.c storage/innobase/btr/btr0sea.c storage/innobase/dict/dict0crea.c storage/innobase/dict/dict0dict.c storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/btr0btr.h storage/innobase/include/btr0btr.ic storage/innobase/include/sync0sync.h storage/innobase/read/read0read.c storage/innobase/row/row0sel.c storage/innobase/sync/sync0sync.c support-files/mysql.spec.sh === modified file 'include/mysql/psi/psi_abi_v1.h.pp' --- a/include/mysql/psi/psi_abi_v1.h.pp 2011-08-11 00:12:28 +0000 +++ b/include/mysql/psi/psi_abi_v1.h.pp 2011-08-16 15:12:11 +0000 @@ -248,7 +248,6 @@ struct PSI_socket_locker_state_v1 const char* m_src_file; int m_src_line; void *m_wait; - my_bool m_idle; }; typedef void (*register_mutex_v1_t) (const char *category, struct PSI_mutex_info_v1 *info, int count); === modified file 'mysql-test/suite/perfschema/include/socket_event_dbg.inc' (properties changed: +x to -x) === modified file 'mysql-test/suite/perfschema/include/socket_summary_check.inc' (properties changed: +x to -x) === modified file 'mysql-test/suite/perfschema/include/socket_summary_check_dbg.inc' (properties changed: +x to -x) === removed file 'mysql-test/suite/perfschema/r/socket_summary_by_instance_func_dbg.result' --- a/mysql-test/suite/perfschema/r/socket_summary_by_instance_func_dbg.result 2011-08-15 01:05:55 +0000 +++ b/mysql-test/suite/perfschema/r/socket_summary_by_instance_func_dbg.result 1970-01-01 00:00:00 +0000 @@ -1,126 +0,0 @@ -# The logging of commands and result sets is mostly disabled. -# There are some messages which help to observe the progress of the test. -# In case some check fails -# - a message about this will be printed -# - some SQL commands which show the unexpected state will be executed -# (logging enabled) -# - the test might abort -# -# 0. Build or set prequisites -# Disable instrumenation for the default connection thread -# Disable all instrumentation except net IO -# Confirm only one client connection -# Get the default OBJECT_INSTANCE_BEGIN -# Truncate my_socket_summary_by_instance -# Truncate socket summary tables -# 1. Check the base line -# 2. Check connect -# 2.1 Connect fails because the user is unknown -# length of user name = 4 character -# length of default db = 9 character -# 2.2 Connect fails because the user is unknown -# length of user name = 14 character (10 more than in 2.1) -# length of default db = 9 character -ERROR 28000: Access denied for user 'boot0123456789'@'localhost' (using password: NO) -# 2.3 Connect should pass, host = localhost -# length of user name = 4 character -# length of default db = 9 character -# 2.4 Connect should pass, host = localhost -# length of user name = 4 character -# length of default db = 14 character (5 more than 2.3) -# 2.5 Connect should pass, host = localhost -# length of user name = 10 character -# length of default db = 9 character -GRANT ALL PRIVILEGES ON *.* TO 'root012345'@'localhost'; -DROP USER 'root012345'@'localhost'; -# 2.6 Connect should pass, host = localhost -# length of user name = 14 character -# length of default db = 9 character -GRANT ALL PRIVILEGES ON *.* to 'root0123456789'@'localhost'; -DROP USER 'root0123456789'@'localhost'; -# 3 Check SELECTs -# 3.1 Check a SELECT ending with server sending an error message. -# Error message is short (unknown table). -SELECT col2 FROM does_not_exist; -ERROR 42S02: Table 'mysqltest.does_not_exist' doesn't exist -# 3.2 Check a SELECT ending with server sending an error message. -# Error message is longer (syntax error). -# Now the statement is a bit longer but the error message -# length does again not depend on statement. -SELECT col2 FROM does_not_exist WHERE col1 = 0; -ERROR 42S02: Table 'mysqltest.does_not_exist' doesn't exist -# 3.3 Check a SELECT earning an empty result set. -SELECT col2 FROM mysqltest.my_aux WHERE col1 = 0; -col2 -# 3.4 Check a SELECT earning an empty result set. -# Short column name is replaced by longer alias. -SELECT col2 "my_lovely_col" FROM mysqltest.my_aux WHERE col1 = 0; -my_lovely_col -# 3.5 Check a SELECT earning one row with an empty string. -SELECT col2 FROM mysqltest.my_aux WHERE col1 = 1; -col2 - -# 3.6 Check a SELECT earning one row with one string one char long. -SELECT col2 FROM mysqltest.my_aux WHERE col1 = 2; -col2 -a -# 3.7 Check a SELECT earning one row with one string 1024 char long. -SELECT col2 FROM mysqltest.my_aux WHERE col1 = 3; -col2 -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -# 4. Check delta details -# 4.1 Check that increased COUNT_* leads to increased -# - increased COUNT_* leads to increased -# SUM_TIMER_* and SUM_NUMBER_OF_BYTES_* -# - no change in COUNT_* leads to no change in -# SUM_TIMER_* and SUM_NUMBER_OF_BYTES_* -# 4.2 Results must be stable -# Everything except "client_connection" for default connection -# because the default connection runs include/wait_till_sleep.inc -# which means a varying amount of statements. -# 4.3 Check the connects -# 4.3.1 Successful connects with different length of user name -SELECT t2.SUM_NUMBER_OF_BYTES_READ - t1.SUM_NUMBER_OF_BYTES_READ as DIFF_BREAD, -t2.SUM_NUMBER_OF_BYTES_WRITE - t1.SUM_NUMBER_OF_BYTES_WRITE as DIFF_BWRITE, EVENT_NAME -FROM mysqltest.socket_summary_by_instance_detail t2 -JOIN mysqltest.socket_summary_by_instance_detail t1 -USING (EVENT_NAME, run) -WHERE t2.OBJECT_INSTANCE_BEGIN <> @default_object_instance_begin -AND t1.OBJECT_INSTANCE_BEGIN <> @default_object_instance_begin -AND t2.statement LIKE 'Connect%root0123456789,%' - AND t1.statement LIKE 'Connect%root012345,%' - AND t1.EVENT_NAME NOT LIKE '%server_unix_socket%' - AND t2.COUNT_READ > 0 and t1.COUNT_READ > 0 and -t2.COUNT_WRITE > 0 and t1.COUNT_WRITE > 0 -AND run = 1; -DIFF_BREAD DIFF_BWRITE EVENT_NAME -4 0 wait/io/socket/sql/client_connection -SELECT COUNT_READ, SUM_NUMBER_OF_BYTES_READ, -COUNT_WRITE, SUM_NUMBER_OF_BYTES_WRITE, -COUNT_MISC, EVENT_NAME, statement -FROM mysqltest.socket_summary_by_instance_detail t2 -WHERE t2.OBJECT_INSTANCE_BEGIN <> @default_object_instance_begin -AND t2.statement LIKE 'Connect%root0123456789,%' - AND run = 1; -COUNT_READ SUM_NUMBER_OF_BYTES_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_WRITE COUNT_MISC EVENT_NAME statement -0 0 0 0 1 wait/io/socket/sql/server_unix_socket Connect (con1,localhost,root0123456789,,mysqltest,,) -0 0 0 0 0 wait/io/socket/sql/server_tcpip_socket Connect (con1,localhost,root0123456789,,mysqltest,,) -4 84 2 101 2 wait/io/socket/sql/client_connection Connect (con1,localhost,root0123456789,,mysqltest,,) -SELECT COUNT_READ, SUM_NUMBER_OF_BYTES_READ, -COUNT_WRITE, SUM_NUMBER_OF_BYTES_WRITE, -COUNT_MISC, EVENT_NAME, statement -FROM mysqltest.socket_summary_by_instance_detail t1 -WHERE t1.OBJECT_INSTANCE_BEGIN <> @default_object_instance_begin -AND t1.statement LIKE 'Connect%root012345,%' - AND run = 1; -COUNT_READ SUM_NUMBER_OF_BYTES_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_WRITE COUNT_MISC EVENT_NAME statement -0 0 0 0 1 wait/io/socket/sql/server_unix_socket Connect (con1,localhost,root012345,,mysqltest,,) -0 0 0 0 0 wait/io/socket/sql/server_tcpip_socket Connect (con1,localhost,root012345,,mysqltest,,) -3 80 2 101 1 wait/io/socket/sql/client_connection Connect (con1,localhost,root012345,,mysqltest,,) -# 4.3.2 Failing (->2.1) vs. passing (-> 2.3) connect -# FIXME: To be implemented after the bug fixes -# 4.3.3 2.3 vs. 2.4 -# FIXME: To be implemented after the bug fixes -# 4.4 Check the differences caused by SQL statements -# FIXME: To be implemented after the bug fixes -# 5. Cleanup No bundle (reason: useless for push emails).