List:Commits« Previous MessageNext Message »
From:Christopher Powers Date:February 28 2011 4:24pm
Subject:bzr commit into mysql-trunk branch (chris.powers:3241) WL#4896
View as plain text  
#At file:///home/cpowers/work/dev/mysql-trunk-wl4896/ based on revid:cpowers@tma-1-20110227024611-zojadsywzvc5jbrt

 3241 Christopher Powers	2011-02-28
      WL#4896 "Performance Schema Net IO"
      
      - Update miscellaneous regression tests

    modified:
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result
      mysql-test/suite/sys_vars/r/all_vars.result
      mysql-test/suite/sys_vars/r/pfs_max_sockets_basic.result
      mysql-test/suite/sys_vars/t/pfs_max_sockets_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_max_sockets_basic.test
=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result	2011-02-23 21:13:48 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result	2011-02-28 16:24:05 +0000
@@ -450,7 +450,7 @@ The following options may be given as th
  Maximum number of instrumented RWLOCK objects.
  --performance-schema-max-socket-classes=# 
  Maximum number of socket instruments.
- --performance-schema-max-sockets=# 
+ --performance-schema-max-socket-instances=# 
  Maximum number of opened instrumented sockets.
  --performance-schema-max-table-handles=# 
  Maximum number of opened instrumented tables.
@@ -900,7 +900,7 @@ performance-schema-max-mutex-instances 1
 performance-schema-max-rwlock-classes 30
 performance-schema-max-rwlock-instances 1000000
 performance-schema-max-socket-classes 50
-performance-schema-max-sockets 10000
+performance-schema-max-socket-instances 10000
 performance-schema-max-table-handles 10000
 performance-schema-max-table-instances 1000
 performance-schema-max-thread-classes 50

=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result	2011-02-22 05:37:44 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result	2011-02-28 16:24:05 +0000
@@ -18,20 +18,23 @@ ERROR 1050 (42S01) at line 177: Table 'e
 ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 676: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -54,20 +57,23 @@ ERROR 1050 (42S01) at line 177: Table 'e
 ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 676: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -88,20 +94,23 @@ ERROR 1050 (42S01) at line 177: Table 'e
 ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 676: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -122,20 +131,23 @@ ERROR 1050 (42S01) at line 177: Table 'e
 ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 676: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -156,20 +168,23 @@ ERROR 1050 (42S01) at line 177: Table 'e
 ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 676: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name

=== modified file 'mysql-test/suite/sys_vars/r/all_vars.result'
--- a/mysql-test/suite/sys_vars/r/all_vars.result	2011-02-23 21:13:48 +0000
+++ b/mysql-test/suite/sys_vars/r/all_vars.result	2011-02-28 16:24:05 +0000
@@ -17,6 +17,7 @@ INNODB_ROLLBACK_SEGMENTS
 INNODB_STATS_PERSISTENT_SAMPLE_PAGES
 RELAY_LOG_BASENAME
 LOG_BIN_BASENAME
+PFS_MAX_SOCKET_INSTANCES
 INNODB_MONITOR_RESET
 INNODB_ANALYZE_IS_PERSISTENT
 INNODB_PRINT_ALL_DEADLOCKS
@@ -31,6 +32,7 @@ INNODB_ROLLBACK_SEGMENTS
 INNODB_STATS_PERSISTENT_SAMPLE_PAGES
 RELAY_LOG_BASENAME
 LOG_BIN_BASENAME
+PFS_MAX_SOCKET_INSTANCES
 INNODB_MONITOR_RESET
 INNODB_ANALYZE_IS_PERSISTENT
 INNODB_PRINT_ALL_DEADLOCKS

=== modified file 'mysql-test/suite/sys_vars/r/pfs_max_sockets_basic.result'
--- a/mysql-test/suite/sys_vars/r/pfs_max_sockets_basic.result	2010-12-09 15:50:04 +0000
+++ b/mysql-test/suite/sys_vars/r/pfs_max_sockets_basic.result	2011-02-28 16:24:05 +0000
@@ -1,23 +1,23 @@
-select @@global.performance_schema_max_sockets;
-@@global.performance_schema_max_sockets
+select @@global.performance_schema_max_socket_instances;
+@@global.performance_schema_max_socket_instances
 123
-select @@session.performance_schema_max_sockets;
-ERROR HY000: Variable 'performance_schema_max_sockets' is a GLOBAL variable
-show global variables like 'performance_schema_max_sockets';
+select @@session.performance_schema_max_socket_instances;
+ERROR HY000: Variable 'performance_schema_max_socket_instances' is a GLOBAL variable
+show global variables like 'performance_schema_max_socket_instances';
 Variable_name	Value
-performance_schema_max_sockets	123
-show session variables like 'performance_schema_max_sockets';
+performance_schema_max_socket_instances	123
+show session variables like 'performance_schema_max_socket_instances';
 Variable_name	Value
-performance_schema_max_sockets	123
+performance_schema_max_socket_instances	123
 select * from information_schema.global_variables
-where variable_name='performance_schema_max_sockets';
+where variable_name='performance_schema_max_socket_instances';
 VARIABLE_NAME	VARIABLE_VALUE
-PERFORMANCE_SCHEMA_MAX_SOCKETS	123
+PERFORMANCE_SCHEMA_MAX_SOCKET_INSTANCES	123
 select * from information_schema.session_variables
-where variable_name='performance_schema_max_sockets';
+where variable_name='performance_schema_max_socket_instances';
 VARIABLE_NAME	VARIABLE_VALUE
-PERFORMANCE_SCHEMA_MAX_SOCKETS	123
-set global performance_schema_max_sockets=1;
-ERROR HY000: Variable 'performance_schema_max_sockets' is a read only variable
-set session performance_schema_max_sockets=1;
-ERROR HY000: Variable 'performance_schema_max_sockets' is a read only variable
+PERFORMANCE_SCHEMA_MAX_SOCKET_INSTANCES	123
+set global performance_schema_max_socket_instances=1;
+ERROR HY000: Variable 'performance_schema_max_socket_instances' is a read only variable
+set session performance_schema_max_socket_instances=1;
+ERROR HY000: Variable 'performance_schema_max_socket_instances' is a read only variable

=== modified file 'mysql-test/suite/sys_vars/t/pfs_max_sockets_basic-master.opt'
--- a/mysql-test/suite/sys_vars/t/pfs_max_sockets_basic-master.opt	2010-12-09 15:50:04 +0000
+++ b/mysql-test/suite/sys_vars/t/pfs_max_sockets_basic-master.opt	2011-02-28 16:24:05 +0000
@@ -1 +1 @@
---loose-enable-performance-schema --loose-performance-schema-max-sockets=123
+--loose-enable-performance-schema --loose-performance-schema-max-socket-instances=123

=== modified file 'mysql-test/suite/sys_vars/t/pfs_max_sockets_basic.test'
--- a/mysql-test/suite/sys_vars/t/pfs_max_sockets_basic.test	2010-12-09 15:50:04 +0000
+++ b/mysql-test/suite/sys_vars/t/pfs_max_sockets_basic.test	2011-02-28 16:24:05 +0000
@@ -20,28 +20,28 @@
 # Only global
 #
 
-select @@global.performance_schema_max_sockets;
+select @@global.performance_schema_max_socket_instances;
 
 --error ER_INCORRECT_GLOBAL_LOCAL_VAR
-select @@session.performance_schema_max_sockets;
+select @@session.performance_schema_max_socket_instances;
 
-show global variables like 'performance_schema_max_sockets';
+show global variables like 'performance_schema_max_socket_instances';
 
-show session variables like 'performance_schema_max_sockets';
+show session variables like 'performance_schema_max_socket_instances';
 
 select * from information_schema.global_variables
-  where variable_name='performance_schema_max_sockets';
+  where variable_name='performance_schema_max_socket_instances';
 
 select * from information_schema.session_variables
-  where variable_name='performance_schema_max_sockets';
+  where variable_name='performance_schema_max_socket_instances';
 
 #
 # Read-only
 #
 
 --error ER_INCORRECT_GLOBAL_LOCAL_VAR
-set global performance_schema_max_sockets=1;
+set global performance_schema_max_socket_instances=1;
 
 --error ER_INCORRECT_GLOBAL_LOCAL_VAR
-set session performance_schema_max_sockets=1;
+set session performance_schema_max_socket_instances=1;
 


Attachment: [text/bzr-bundle] bzr/chris.powers@oracle.com-20110228162405-775jewjqy2kvx195.bundle
Thread
bzr commit into mysql-trunk branch (chris.powers:3241) WL#4896Christopher Powers28 Feb