From: Christopher Powers Date: November 21 2011 9:03pm Subject: bzr push into mysql-trunk-wl5461 branch (chris.powers:3445 to 3446) WL#5461 List-Archive: http://lists.mysql.com/commits/142109 Message-Id: <201111212103.pALL3t88002142@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3446 Christopher Powers 2011-11-21 WL#5461 PERFORMANCE_SCHEMA MY.CNF Defaults Setup Ensure that instrument and consumer settings cannot be seen or changed, and that the corresponding tests verify the same. Remove 'enabled/disabled' as option values. modified: mysql-test/suite/perfschema/r/setup_consumers_defaults.result mysql-test/suite/perfschema/r/setup_instruments_defaults.result mysql-test/suite/perfschema/t/setup_consumers_defaults.test mysql-test/suite/perfschema/t/setup_instruments_defaults.test sql/set_var.cc storage/perfschema/pfs_server.cc 3445 Christopher Powers 2011-11-21 [merge] local merge added: mysql-test/suite/binlog/r/binlog_hexdump.result mysql-test/suite/binlog/std_data/bug11747887-bin.000003 mysql-test/suite/binlog/t/binlog_hexdump.test mysql-test/suite/rpl/r/rpl_parallel_load_data.result mysql-test/suite/rpl/t/rpl_parallel_load_data-slave.opt mysql-test/suite/rpl/t/rpl_parallel_load_data.test modified: mysql-test/r/create-big.result mysql-test/suite/federated/federated.test mysql-test/suite/federated/federated_plugin.test mysql-test/suite/innodb_fts/r/innodb_fts_misc.result mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result mysql-test/suite/innodb_fts/t/innodb_fts_misc.test mysql-test/suite/innodb_fts/t/innodb_fts_misc_1.test mysql-test/suite/rpl/r/rpl_parallel_ddl.result mysql-test/suite/rpl/t/rpl_parallel_ddl.test mysql-test/t/create-big.test mysql-test/t/disabled.def sql/log_event.cc sql/log_event.h sql/rpl_rli.h sql/rpl_rli_pdb.cc sql/rpl_rli_pdb.h sql/sql_insert.cc sql/sql_table.cc storage/innobase/fts/fts0que.c storage/innobase/row/row0ftsort.c storage/innobase/row/row0merge.c storage/innobase/srv/srv0start.c === modified file 'mysql-test/suite/perfschema/r/setup_consumers_defaults.result' --- a/mysql-test/suite/perfschema/r/setup_consumers_defaults.result 2011-11-17 21:44:20 +0000 +++ b/mysql-test/suite/perfschema/r/setup_consumers_defaults.result 2011-11-21 21:02:04 +0000 @@ -11,3 +11,9 @@ events_waits_history YES events_waits_history_long NO global_instrumentation YES thread_instrumentation YES +SELECT @@performance_schema_consumer_events_stages_current; +ERROR HY000: Unknown system variable 'performance_schema_consumer_events_stages_current' +SET @@performance_schema_consumer_events_stages_current=0; +ERROR HY000: Unknown system variable 'performance_schema_consumer_events_stages_current' +SHOW VARIABLES LIKE "performance_schema_consumer%"; +Variable_name Value === modified file 'mysql-test/suite/perfschema/r/setup_instruments_defaults.result' --- a/mysql-test/suite/perfschema/r/setup_instruments_defaults.result 2011-11-17 21:44:20 +0000 +++ b/mysql-test/suite/perfschema/r/setup_instruments_defaults.result 2011-11-21 21:02:04 +0000 @@ -32,3 +32,5 @@ ORDER BY name; NAME ENABLED TIMED wait/synch/mutex/sql/Delayed_insert::mutex NO NO wait/synch/mutex/sql/hash_filo::lock NO NO +SHOW VARIABLES LIKE "%/wait/synch/mutex%"; +Variable_name Value === modified file 'mysql-test/suite/perfschema/t/setup_consumers_defaults.test' --- a/mysql-test/suite/perfschema/t/setup_consumers_defaults.test 2011-11-17 21:44:20 +0000 +++ b/mysql-test/suite/perfschema/t/setup_consumers_defaults.test 2011-11-21 21:02:04 +0000 @@ -1,6 +1,18 @@ + # Tests for PERFORMANCE_SCHEMA --source include/not_embedded.inc --source include/have_perfschema.inc SELECT * FROM performance_schema.setup_consumers ORDER BY name; + +# +# Verify that the consumer option settings cannot be changed or seen +# +--error ER_UNKNOWN_SYSTEM_VARIABLE +SELECT @@performance_schema_consumer_events_stages_current; + +--error ER_UNKNOWN_SYSTEM_VARIABLE +SET @@performance_schema_consumer_events_stages_current=0; + +SHOW VARIABLES LIKE "performance_schema_consumer%"; === modified file 'mysql-test/suite/perfschema/t/setup_instruments_defaults.test' --- a/mysql-test/suite/perfschema/t/setup_instruments_defaults.test 2011-11-17 21:44:20 +0000 +++ b/mysql-test/suite/perfschema/t/setup_instruments_defaults.test 2011-11-21 21:02:04 +0000 @@ -34,3 +34,7 @@ WHERE name IN ( AND enabled = 'no' AND timed = 'no' ORDER BY name; +# +# Verify that the instrument startup settings are not not visible. +# +SHOW VARIABLES LIKE "%/wait/synch/mutex%"; \ No newline at end of file === modified file 'sql/set_var.cc' --- a/sql/set_var.cc 2011-11-21 20:15:58 +0000 +++ b/sql/set_var.cc 2011-11-21 21:02:04 +0000 @@ -532,7 +532,7 @@ sys_var *intern_find_sys_var(const char (uchar*) str, length ? length : strlen(str)); /* Don't show non-visible variables. */ - if (var->not_visible()) + if (var && var->not_visible()) return NULL; return var; === modified file 'storage/perfschema/pfs_server.cc' --- a/storage/perfschema/pfs_server.cc 2011-11-17 21:44:20 +0000 +++ b/storage/perfschema/pfs_server.cc 2011-11-21 21:02:04 +0000 @@ -232,8 +232,7 @@ int add_pfs_instr_to_array(const char* n if (!my_strcasecmp(&my_charset_latin1, value, "true") || !my_strcasecmp(&my_charset_latin1, value, "on") || !my_strcasecmp(&my_charset_latin1, value, "1") || - !my_strcasecmp(&my_charset_latin1, value, "yes") || - !my_strcasecmp(&my_charset_latin1, value, "enabled")) + !my_strcasecmp(&my_charset_latin1, value, "yes")) { e->m_enabled= true; e->m_timed= true; @@ -242,8 +241,7 @@ int add_pfs_instr_to_array(const char* n if (!my_strcasecmp(&my_charset_latin1, value, "false") || !my_strcasecmp(&my_charset_latin1, value, "off") || !my_strcasecmp(&my_charset_latin1, value, "0") || - !my_strcasecmp(&my_charset_latin1, value, "no") || - !my_strcasecmp(&my_charset_latin1, value, "disabled")) + !my_strcasecmp(&my_charset_latin1, value, "no")) { e->m_enabled= false; e->m_timed= false; No bundle (reason: useless for push emails).