List:Commits« Previous MessageNext Message »
From:Christopher Powers Date:December 8 2010 9:21pm
Subject:bzr push into mysql-trunk-wl4896 branch (chris.powers:3213 to 3214) WL#4896
View as plain text  
 3214 Christopher Powers	2010-12-08
      WL#4896 Performance schema Net IO
      
      Cleaning up PB2...

    modified:
      mysql-test/suite/perfschema/t/disabled.def
      mysql-test/suite/sys_vars/r/all_vars.result
 3213 Christopher Powers	2010-12-08
      WL#4896 Peformance schema Net IO
      
      Merge w/ mysql-trunk - misc fixes

    modified:
      sql/sys_vars.cc
      storage/perfschema/pfs_engine_table.cc
      storage/perfschema/pfs_server.cc
=== modified file 'mysql-test/suite/perfschema/t/disabled.def'
--- a/mysql-test/suite/perfschema/t/disabled.def	2010-11-12 13:10:44 +0000
+++ b/mysql-test/suite/perfschema/t/disabled.def	2010-12-08 21:18:05 +0000
@@ -25,3 +25,44 @@
 #
 ##############################################################################
 
+perfschema.start_server_no_rwlock_inst  : WL#4896 Perfschema NET IO - temporary
+perfschema.start_server_no_rwlock_class : WL#4896 Perfschema NET IO - temporary
+perfschema.start_server_no_mutex_inst   : WL#4896 Perfschema NET IO - temporary
+start_server_nothing                    : WL#4896 Perfschema NET IO - temporary
+start_server_off                        : WL#4896 Perfschema NET IO - temporary
+start_server_no_cond_class              : WL#4896 Perfschema NET IO - temporary
+start_server_no_cond_inst               : WL#4896 Perfschema NET IO - temporary
+start_server_no_file_class              : WL#4896 Perfschema NET IO - temporary
+start_server_no_file_inst               : WL#4896 Perfschema NET IO - temporary
+start_server_no_mutex_class             : WL#4896 Perfschema NET IO - temporary
+start_server_no_mutex_inst              : WL#4896 Perfschema NET IO - temporary
+start_server_no_rwlock_class            : WL#4896 Perfschema NET IO - temporary
+start_server_no_rwlock_inst             : WL#4896 Perfschema NET IO - temporary
+start_server_no_setup_actors            : WL#4896 Perfschema NET IO - temporary
+start_server_no_setup_objects           : WL#4896 Perfschema NET IO - temporary
+start_server_no_table_hdl               : WL#4896 Perfschema NET IO - temporary
+start_server_no_table_inst              : WL#4896 Perfschema NET IO - temporary
+start_server_nothing                    : WL#4896 Perfschema NET IO - temporary
+start_server_no_thread_class            : WL#4896 Perfschema NET IO - temporary
+start_server_no_thread_inst             : WL#4896 Perfschema NET IO - temporary
+aggregate                               : WL#4896 Perfschema NET IO - temporary
+csv_table_io                            : WL#4896 Perfschema NET IO - temporary
+indexed_table_io                        : WL#4896 Perfschema NET IO - temporary
+start_server_on                         : WL#4896 Perfschema NET IO - temporary
+information_schema                      : WL#4896 Perfschema NET IO - temporary
+innodb_table_io                         : WL#4896 Perfschema NET IO - temporary
+memory_table_io                         : WL#4896 Perfschema NET IO - temporary
+merge_table_io                          : WL#4896 Perfschema NET IO - temporary
+multi_table_io                          : WL#4896 Perfschema NET IO - temporary
+myisam_file_io                          : WL#4896 Perfschema NET IO - temporary
+myisam_table_io                         : WL#4896 Perfschema NET IO - temporary
+part_table_io                           : WL#4896 Perfschema NET IO - temporary
+pfs_upgrade_lc0                         : WL#4896 Perfschema NET IO - temporary
+privilege_table_io                      : WL#4896 Perfschema NET IO - temporary
+temp_table_io                           : WL#4896 Perfschema NET IO - temporary
+trigger_table_io                        : WL#4896 Perfschema NET IO - temporary
+schema_lc0                              : WL#4896 Perfschema NET IO - temporary
+view_table_io                           : WL#4896 Perfschema NET IO - temporary
+rollback_table_io                       : WL#4896 Perfschema NET IO - temporary
+
+

=== modified file 'mysql-test/suite/sys_vars/r/all_vars.result'
--- a/mysql-test/suite/sys_vars/r/all_vars.result	2010-11-29 11:28:55 +0000
+++ b/mysql-test/suite/sys_vars/r/all_vars.result	2010-12-08 21:18:05 +0000
@@ -12,9 +12,11 @@ select variable_name as `There should be
 left join t1 on variable_name=test_name where test_name is null;
 There should be *no* variables listed below:
 INNODB_STATS_TRANSIENT_SAMPLE_PAGES
+PFS_MAX_SOCKETS
 INNODB_STATS_PERSISTENT_SAMPLE_PAGES
 RELAY_LOG_BASENAME
 LOG_BIN_BASENAME
+PFS_MAX_SOCKET_CLASSES
 INNODB_ANALYZE_IS_PERSISTENT
 INNODB_RESET_MONITOR_COUNTER
 INNODB_RESET_ALL_MONITOR_COUNTER
@@ -23,9 +25,11 @@ INNODB_DISABLE_MONITOR_COUNTER
 INNODB_ENABLE_MONITOR_COUNTER
 INNODB_FILE_FORMAT_MAX
 INNODB_STATS_TRANSIENT_SAMPLE_PAGES
+PFS_MAX_SOCKETS
 INNODB_STATS_PERSISTENT_SAMPLE_PAGES
 RELAY_LOG_BASENAME
 LOG_BIN_BASENAME
+PFS_MAX_SOCKET_CLASSES
 INNODB_ANALYZE_IS_PERSISTENT
 INNODB_RESET_MONITOR_COUNTER
 INNODB_RESET_ALL_MONITOR_COUNTER


Attachment: [text/bzr-bundle] bzr/chris.powers@oracle.com-20101208211805-caqbv3n9sjmkxqeo.bundle
Thread
bzr push into mysql-trunk-wl4896 branch (chris.powers:3213 to 3214) WL#4896Christopher Powers8 Dec