Skip to content

Commit a949eda

Browse files
author
Paweł Andruszkiewicz
committed
BUG#37278169 Exclude the mysql_autopilot schema
The `mysql_autopilot` schema is now automatically excluded when dumping with the `ocimds` option enabled. The `mysql_autopilot` schema is now automatically excluded when loading a dump into an MHS instance. Change-Id: I18f254ff769240043156c4903680129a416e269a
1 parent b50ce36 commit a949eda

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

modules/util/common/dump/constants.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ constexpr inline std::array k_excluded_schemas = {
5050
constexpr inline std::array k_mhs_excluded_schemas = {
5151
// stores the audit plugin's configuration
5252
"mysql_audit",
53+
// stores the autopilot's information
54+
"mysql_autopilot",
5355
// stores the firewall's configuration
5456
"mysql_firewall",
5557
// stores the options information

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
@@ -2712,8 +2712,9 @@ def TEST_STRING_OPTION(option):
27122712

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
2715+
# BUG#37278169 - exclude mysql_autopilot schema
27152716
# create schemas
2716-
schema_names = [ "mysql_audit", "mysql_firewall", "mysql_option" ]
2717+
schema_names = [ "mysql_audit", "mysql_autopilot", "mysql_firewall", "mysql_option" ]
27172718

27182719
def create_mhs_schemas(s):
27192720
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
@@ -3590,8 +3590,9 @@ def account_for_grant():
35903590
#@<> BUG#35550282 - exclude `mysql_audit` schema if the `ocimds` option is set
35913591
# BUG#35805866 - exclude `mysql_firewall` schema if the `ocimds` option is set
35923592
# BUG#37023079 - exclude `mysql_option` schema if the `ocimds` option is set
3593+
# BUG#37278169 - exclude `mysql_autopilot` schema if the `ocimds` option is set
35933594
# setup
3594-
schema_names = [ "mysql_audit", "mysql_firewall", "mysql_option" ]
3595+
schema_names = [ "mysql_audit", "mysql_autopilot", "mysql_firewall", "mysql_option" ]
35953596

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

0 commit comments

Comments
 (0)