From 4c7cfd26243dd0592e5aae5f24d5fb804ff75619 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Tue, 29 Oct 2024 14:22:59 +0400 Subject: [PATCH] MDEV-34817 perfschema.lowercase_fs_off fails on buildbot I pushed this patch in a mistake to 11.7 instead of 11.6. Backporting from 11.7. This is a workaround patch to make buildbot green. Renaming databases from db1/DB2 to m33020_db1/m33020_DB1 to make them unique. So the garbage left by other tests does not show up any more. The real problem will be fixed under terms of: MDEV-35282 Performance schema does not clear package routines --- .../perfschema/r/lowercase_fs_off.result | 32 +++++++++---------- .../suite/perfschema/t/lowercase_fs_off.test | 23 +++++++------ 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/mysql-test/suite/perfschema/r/lowercase_fs_off.result b/mysql-test/suite/perfschema/r/lowercase_fs_off.result index 03981a86514..bd0f6a832b9 100644 --- a/mysql-test/suite/perfschema/r/lowercase_fs_off.result +++ b/mysql-test/suite/perfschema/r/lowercase_fs_off.result @@ -1,22 +1,22 @@ # # MDEV-33020 The database part is not case sensitive in SP names in PERFORMANCE_SCHEMA # -CREATE OR REPLACE DATABASE DB1; -CREATE OR REPLACE DATABASE db1; -CREATE PROCEDURE DB1.sp() SELECT 'This is DB1.sp'; -CREATE PROCEDURE db1.sp() SELECT 'This is db1.sp'; -CALL DB1.sp(); -This is DB1.sp -This is DB1.sp -CREATE PROCEDURE DB1.sp2() SELECT 'This is DB1.sp2'; -CALL db1.sp(); -This is db1.sp -This is db1.sp +CREATE OR REPLACE DATABASE m33020_DB1; +CREATE OR REPLACE DATABASE m33020_db1; +CREATE PROCEDURE m33020_DB1.sp() SELECT 'This is m33020_DB1.sp'; +CREATE PROCEDURE m33020_db1.sp() SELECT 'This is m33020_db1.sp'; +CALL m33020_DB1.sp(); +This is m33020_DB1.sp +This is m33020_DB1.sp +CREATE PROCEDURE m33020_DB1.sp2() SELECT 'This is m33020_DB1.sp2'; +CALL m33020_db1.sp(); +This is m33020_db1.sp +This is m33020_db1.sp SELECT object_type, object_schema, object_name, count_star, count_statements, sum_rows_sent FROM performance_schema.events_statements_summary_by_program -WHERE object_type='procedure' AND LOWER(object_schema)='db1'; +WHERE object_type='procedure' AND LOWER(object_schema)='m33020_db1'; object_type object_schema object_name count_star count_statements sum_rows_sent -PROCEDURE DB1 sp 1 1 1 -PROCEDURE db1 sp 1 1 1 -DROP DATABASE db1; -DROP DATABASE DB1; +PROCEDURE m33020_DB1 sp 1 1 1 +PROCEDURE m33020_db1 sp 1 1 1 +DROP DATABASE m33020_db1; +DROP DATABASE m33020_DB1; diff --git a/mysql-test/suite/perfschema/t/lowercase_fs_off.test b/mysql-test/suite/perfschema/t/lowercase_fs_off.test index 1132ce274eb..700f472ee34 100644 --- a/mysql-test/suite/perfschema/t/lowercase_fs_off.test +++ b/mysql-test/suite/perfschema/t/lowercase_fs_off.test @@ -10,18 +10,21 @@ --echo # MDEV-33020 The database part is not case sensitive in SP names in PERFORMANCE_SCHEMA --echo # -CREATE OR REPLACE DATABASE DB1; -CREATE OR REPLACE DATABASE db1; -CREATE PROCEDURE DB1.sp() SELECT 'This is DB1.sp'; -CREATE PROCEDURE db1.sp() SELECT 'This is db1.sp'; -CALL DB1.sp(); +# the m33020_ prefix was added to the database names +# to temporarily address MDEV-34817 + +CREATE OR REPLACE DATABASE m33020_DB1; +CREATE OR REPLACE DATABASE m33020_db1; +CREATE PROCEDURE m33020_DB1.sp() SELECT 'This is m33020_DB1.sp'; +CREATE PROCEDURE m33020_db1.sp() SELECT 'This is m33020_db1.sp'; +CALL m33020_DB1.sp(); # This is needed to reset the SP cache (a MDEV-33019 workaround) -CREATE PROCEDURE DB1.sp2() SELECT 'This is DB1.sp2'; -CALL db1.sp(); +CREATE PROCEDURE m33020_DB1.sp2() SELECT 'This is m33020_DB1.sp2'; +CALL m33020_db1.sp(); SELECT object_type, object_schema, object_name, count_star, count_statements, sum_rows_sent FROM performance_schema.events_statements_summary_by_program -WHERE object_type='procedure' AND LOWER(object_schema)='db1'; +WHERE object_type='procedure' AND LOWER(object_schema)='m33020_db1'; -DROP DATABASE db1; -DROP DATABASE DB1; +DROP DATABASE m33020_db1; +DROP DATABASE m33020_DB1;