From: Christopher Powers Date: July 19 2011 4:41pm Subject: bzr push into mysql-trunk branch (chris.powers:3316 to 3323) WL#4896 List-Archive: http://lists.mysql.com/commits/140373 Message-Id: <201107191641.p6JGfEXC005804@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3323 Christopher Powers 2011-07-19 WL#4896 "Performance Schema Net IO" Fix for socket accept() modified: include/mysql/psi/mysql_socket.h 3322 Christopher Powers 2011-07-19 WL#4896 "Performance Schema Net IO" - Restored check for null pointer in mysql_socket_socket() and mysql_socket_accept() modified: include/mysql/psi/mysql_socket.h sql/mysqld.cc 3321 Christopher Powers 2011-07-19 WL#4896 "Performance Schema Net IO" Improved stat collection for socket accept() by attributing wait time and op count to listener socket instead of new socket. modified: include/mysql/psi/mysql_socket.h 3320 Christopher Powers 2011-07-18 WL#4896 "Performance Schema Net IO" - Fix to recent performance improvements modified: storage/perfschema/pfs_instr.cc 3319 Christopher Powers 2011-07-16 WL#4896 "Performance Schema Net IO" Integrating peformance improvements in socket instrumentation. modified: include/mysql/psi/mysql_idle.h include/mysql/psi/mysql_socket.h sql/sql_parse.cc storage/perfschema/pfs.cc 3318 Christopher Powers 2011-07-16 WL#4896 "Performance Schema Net IO" Integrating performance improvements modified: sql/sql_parse.cc storage/perfschema/pfs.cc 3317 Christopher Powers 2011-07-16 Integrating performance improvements modified: storage/perfschema/pfs.cc storage/perfschema/pfs_instr.cc storage/perfschema/pfs_instr.h storage/perfschema/table_setup_instruments.cc 3316 Christopher Powers 2011-07-14 [merge] Merge with mysql-trunk added: mysql-test/suite/rpl/r/rpl_row_corruption.result mysql-test/suite/rpl/t/rpl_row_corruption-slave.opt mysql-test/suite/rpl/t/rpl_row_corruption.test modified: mysql-test/r/grant.result mysql-test/r/information_schema.result mysql-test/r/sp.result mysql-test/r/view.result mysql-test/t/disabled.def mysql-test/t/grant.test mysql-test/t/information_schema.test mysql-test/t/sp.test mysql-test/t/view.test sql/log_event.cc sql/sp_head.cc sql/sp_head.h sql/sql_insert.cc sql/sql_parse.cc sql/sql_select.cc sql/sql_view.cc sql/sql_yacc.yy storage/innobase/lock/lock0lock.c tests/mysql_client_test.c Diff too large for email (15423 lines, the limit is 10000). No bundle (reason: useless for push emails).