1 files changed, 0 insertions, 79 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 9b55c09a170..ed5e34463e9 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -75,85 +75,6 @@ static Sys_var_mybool Sys_pfs_enabled(
        PARSED_EARLY READ_ONLY GLOBAL_VAR(pfs_param.m_enabled),
        CMD_LINE(OPT_ARG), DEFAULT(FALSE));
 
-static Sys_var_charptr Sys_pfs_instrument(
-       "performance_schema_instrument",
-       "Default startup value for a performance schema instrument.",
-       PARSED_EARLY READ_ONLY NOT_VISIBLE GLOBAL_VAR(pfs_param.m_pfs_instrument),
-       CMD_LINE(OPT_ARG, OPT_PFS_INSTRUMENT),
-       IN_FS_CHARSET, DEFAULT(""));
-
-static Sys_var_mybool Sys_pfs_consumer_events_stages_current(
-       "performance_schema_consumer_events_stages_current",
-       "Default startup value for the events_stages_current consumer.",
-       PARSED_EARLY READ_ONLY NOT_VISIBLE GLOBAL_VAR(pfs_param.m_consumer_events_stages_current_enabled),
-       CMD_LINE(OPT_ARG), DEFAULT(FALSE));
-
-static Sys_var_mybool Sys_pfs_consumer_events_stages_history(
-       "performance_schema_consumer_events_stages_history",
-       "Default startup value for the events_stages_history consumer.",
-       PARSED_EARLY READ_ONLY NOT_VISIBLE GLOBAL_VAR(pfs_param.m_consumer_events_stages_history_enabled),
-       CMD_LINE(OPT_ARG), DEFAULT(FALSE));
-
-static Sys_var_mybool Sys_pfs_consumer_events_stages_history_long(
-       "performance_schema_consumer_events_stages_history_long",
-       "Default startup value for the events_stages_history_long consumer.",
-       PARSED_EARLY READ_ONLY NOT_VISIBLE GLOBAL_VAR(pfs_param.m_consumer_events_stages_history_long_enabled),
-       CMD_LINE(OPT_ARG), DEFAULT(FALSE));
-
-static Sys_var_mybool Sys_pfs_consumer_events_statements_current(
-       "performance_schema_consumer_events_statements_current",
-       "Default startup value for the events_statements_current consumer.",
-       PARSED_EARLY READ_ONLY NOT_VISIBLE GLOBAL_VAR(pfs_param.m_consumer_events_statements_current_enabled),
-       CMD_LINE(OPT_ARG), DEFAULT(TRUE));
-
-static Sys_var_mybool Sys_pfs_consumer_events_statements_history(
-       "performance_schema_consumer_events_statements_history",
-       "Default startup value for the events_statements_history consumer.",
-       PARSED_EARLY READ_ONLY NOT_VISIBLE GLOBAL_VAR(pfs_param.m_consumer_events_statements_history_enabled),
-       CMD_LINE(OPT_ARG), DEFAULT(FALSE));
-
-static Sys_var_mybool Sys_pfs_consumer_events_statements_history_long(
-       "performance_schema_consumer_events_statements_history_long",
-       "Default startup value for the events_statements_history_long consumer.",
-       PARSED_EARLY READ_ONLY NOT_VISIBLE GLOBAL_VAR(pfs_param.m_consumer_events_statements_history_long_enabled),
-       CMD_LINE(OPT_ARG), DEFAULT(FALSE));
-
-static Sys_var_mybool Sys_pfs_consumer_events_waits_current(
-       "performance_schema_consumer_events_waits_current",
-       "Default startup value for the events_waits_current consumer.",
-       PARSED_EARLY READ_ONLY NOT_VISIBLE GLOBAL_VAR(pfs_param.m_consumer_events_waits_current_enabled),
-       CMD_LINE(OPT_ARG), DEFAULT(FALSE));
-
-static Sys_var_mybool Sys_pfs_consumer_events_waits_history(
-       "performance_schema_consumer_events_waits_history",
-       "Default startup value for the events_waits_history consumer.",
-       PARSED_EARLY READ_ONLY NOT_VISIBLE GLOBAL_VAR(pfs_param.m_consumer_events_waits_history_enabled),
-       CMD_LINE(OPT_ARG), DEFAULT(FALSE));
-
-static Sys_var_mybool Sys_pfs_consumer_events_waits_history_long(
-       "performance_schema_consumer_events_waits_history_long",
-       "Default startup value for the events_waits_history_long consumer.",
-       PARSED_EARLY READ_ONLY NOT_VISIBLE GLOBAL_VAR(pfs_param.m_consumer_events_waits_history_long_enabled),
-       CMD_LINE(OPT_ARG), DEFAULT(FALSE));
-
-static Sys_var_mybool Sys_pfs_consumer_global_instrumentation(
-       "performance_schema_consumer_global_instrumentation",
-       "Default startup value for the global_instrumentation consumer.",
-       PARSED_EARLY READ_ONLY NOT_VISIBLE GLOBAL_VAR(pfs_param.m_consumer_global_instrumentation_enabled),
-       CMD_LINE(OPT_ARG), DEFAULT(TRUE));
-
-static Sys_var_mybool Sys_pfs_consumer_thread_instrumentation(
-       "performance_schema_consumer_thread_instrumentation",
-       "Default startup value for the thread_instrumentation consumer.",
-       PARSED_EARLY READ_ONLY NOT_VISIBLE GLOBAL_VAR(pfs_param.m_consumer_thread_instrumentation_enabled),
-       CMD_LINE(OPT_ARG), DEFAULT(TRUE));
-
-static Sys_var_mybool Sys_pfs_consumer_statement_digest(
-       "performance_schema_consumer_statements_digest",
-       "Default startup value for the statements_digest consumer.",
-       PARSED_EARLY READ_ONLY NOT_VISIBLE GLOBAL_VAR(pfs_param.m_consumer_statement_digest_enabled),
-       CMD_LINE(OPT_ARG), DEFAULT(TRUE));
-
 static Sys_var_ulong Sys_pfs_events_waits_history_long_size(
        "performance_schema_events_waits_history_long_size",
        "Number of rows in EVENTS_WAITS_HISTORY_LONG.",