From 190280205b83be33aeb2bc3b637ad5919896f611 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 28 Mar 2024 21:31:24 +0100 Subject: [PATCH] perfschema is disabled until it's enabled as it was thinking it was enabled even if initialize_performance_schema wasn't called at all --- storage/perfschema/pfs_instr_class.cc | 2 +- storage/perfschema/unittest/pfs_instr_class-t.cc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/storage/perfschema/pfs_instr_class.cc b/storage/perfschema/pfs_instr_class.cc index 2b1a80d3e11..fa85d8610bf 100644 --- a/storage/perfschema/pfs_instr_class.cc +++ b/storage/perfschema/pfs_instr_class.cc @@ -55,7 +55,7 @@ Indicate if the performance schema is enabled. This flag is set at startup, and never changes. */ -my_bool pfs_enabled= TRUE; +my_bool pfs_enabled= FALSE; /** PFS_INSTRUMENT option settings array diff --git a/storage/perfschema/unittest/pfs_instr_class-t.cc b/storage/perfschema/unittest/pfs_instr_class-t.cc index 7651898d684..76e3668d378 100644 --- a/storage/perfschema/unittest/pfs_instr_class-t.cc +++ b/storage/perfschema/unittest/pfs_instr_class-t.cc @@ -743,6 +743,7 @@ void do_all_tests() int main(int argc, char **argv) { plan(209); + pfs_enabled= 1; MY_INIT(argv[0]); do_all_tests(); my_end(0);