Skip to content

Commit 14bc54e

Browse files
author
Paweł Andruszkiewicz
committed
BUG#37637843 Exclude the MRS schemas
The `mysql_rest_service_metadata` and `mysql_tasks` schemas are now automatically excluded when dumping an instance with the `ocimds` option enabled. The `mysql_rest_service_metadata` and `mysql_tasks` schemas are now automatically excluded when loading a dump into an MHS instance. Change-Id: I612e9724bcfba0d708d11851de052833ce119646
1 parent ee1ad8e commit 14bc54e

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

modules/util/common/dump/constants.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ constexpr inline std::array k_mhs_excluded_schemas = {
5858
"mysql_firewall",
5959
// stores the options information
6060
"mysql_option",
61+
// stores the MRS metadata
62+
"mysql_rest_service_metadata",
63+
// MRS related
64+
"mysql_tasks",
6165
};
6266

6367
} // namespace common

unittest/scripts/auto/py_shell/scripts/util_dump_and_load_norecord.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2713,8 +2713,9 @@ def TEST_STRING_OPTION(option):
27132713
#@<> BUG#35830920 mysql_audit and mysql_firewall schemas should be automatically excluded when loading a dump into MHS - setup {not __dbug_off}
27142714
# BUG#37023079 - exclude mysql_option schema
27152715
# BUG#37278169 - exclude mysql_autopilot schema
2716+
# BUG#37637843 - exclude `mysql_rest_service_metadata` and `mysql_tasks` schemas
27162717
# create schemas
2717-
schema_names = [ "mysql_audit", "mysql_autopilot", "mysql_firewall", "mysql_option" ]
2718+
schema_names = [ "mysql_audit", "mysql_autopilot", "mysql_firewall", "mysql_option", "mysql_rest_service_metadata", "mysql_tasks" ]
27182719

27192720
def create_mhs_schemas(s):
27202721
for schema_name in schema_names:

unittest/scripts/auto/py_shell/scripts/util_dump_instance_norecord.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3599,8 +3599,9 @@ def account_for_grant():
35993599
# BUG#35805866 - exclude `mysql_firewall` schema if the `ocimds` option is set
36003600
# BUG#37023079 - exclude `mysql_option` schema if the `ocimds` option is set
36013601
# BUG#37278169 - exclude `mysql_autopilot` schema if the `ocimds` option is set
3602+
# BUG#37637843 - exclude `mysql_rest_service_metadata` and `mysql_tasks` schemas
36023603
# setup
3603-
schema_names = [ "mysql_audit", "mysql_autopilot", "mysql_firewall", "mysql_option" ]
3604+
schema_names = [ "mysql_audit", "mysql_autopilot", "mysql_firewall", "mysql_option", "mysql_rest_service_metadata", "mysql_tasks" ]
36043605

36053606
for schema_name in schema_names:
36063607
session.run_sql("DROP SCHEMA IF EXISTS !", [schema_name])

0 commit comments

Comments
 (0)