Merge "mysqldump: add --set-gtid-purged=COMMENTED to mysqldump command"
This commit is contained in:
commit
0a0418e327
@ -1805,7 +1805,8 @@ class MySQLInnoDBClusterCharm(
|
|||||||
|
|
||||||
bucmd = ["/usr/bin/mysqldump", "-u", _user,
|
bucmd = ["/usr/bin/mysqldump", "-u", _user,
|
||||||
"--triggers", "--routines", "--events",
|
"--triggers", "--routines", "--events",
|
||||||
"--ignore-table=mysql.event"]
|
"--ignore-table=mysql.event",
|
||||||
|
"--set-gtid-purged=COMMENTED"]
|
||||||
if databases is not None:
|
if databases is not None:
|
||||||
_filename = os.path.join(
|
_filename = os.path.join(
|
||||||
backup_dir,
|
backup_dir,
|
||||||
|
@ -1502,6 +1502,7 @@ class TestMySQLInnoDBClusterCharm(test_utils.PatchHelper):
|
|||||||
mock.call(
|
mock.call(
|
||||||
["/usr/bin/mysqldump", "-u", "root", "--triggers",
|
["/usr/bin/mysqldump", "-u", "root", "--triggers",
|
||||||
"--routines", "--events", "--ignore-table=mysql.event",
|
"--routines", "--events", "--ignore-table=mysql.event",
|
||||||
|
"--set-gtid-purged=COMMENTED",
|
||||||
"--result-file", _filename, "--all-databases"]),
|
"--result-file", _filename, "--all-databases"]),
|
||||||
mock.call(["/usr/bin/gzip", _filename])]
|
mock.call(["/usr/bin/gzip", _filename])]
|
||||||
|
|
||||||
@ -1517,6 +1518,7 @@ class TestMySQLInnoDBClusterCharm(test_utils.PatchHelper):
|
|||||||
mock.call(
|
mock.call(
|
||||||
["/usr/bin/mysqldump", "-u", "root", "-ppass", "--triggers",
|
["/usr/bin/mysqldump", "-u", "root", "-ppass", "--triggers",
|
||||||
"--routines", "--events", "--ignore-table=mysql.event",
|
"--routines", "--events", "--ignore-table=mysql.event",
|
||||||
|
"--set-gtid-purged=COMMENTED",
|
||||||
"--result-file", _filename, "--databases", _dbs]),
|
"--result-file", _filename, "--databases", _dbs]),
|
||||||
mock.call(["/usr/bin/gzip", _filename])]
|
mock.call(["/usr/bin/gzip", _filename])]
|
||||||
self.assertEqual(midbc.mysqldump(_path, databases=_dbs),
|
self.assertEqual(midbc.mysqldump(_path, databases=_dbs),
|
||||||
@ -1531,6 +1533,7 @@ class TestMySQLInnoDBClusterCharm(test_utils.PatchHelper):
|
|||||||
mock.call(
|
mock.call(
|
||||||
["/usr/bin/mysqldump", "-u", "root", "-ppass", "--triggers",
|
["/usr/bin/mysqldump", "-u", "root", "-ppass", "--triggers",
|
||||||
"--routines", "--events", "--ignore-table=mysql.event",
|
"--routines", "--events", "--ignore-table=mysql.event",
|
||||||
|
"--set-gtid-purged=COMMENTED",
|
||||||
"--result-file", _filename, "--databases"].extend(
|
"--result-file", _filename, "--databases"].extend(
|
||||||
_dbs.split(","))),
|
_dbs.split(","))),
|
||||||
mock.call(["/usr/bin/gzip", _filename])]
|
mock.call(["/usr/bin/gzip", _filename])]
|
||||||
|
Loading…
Reference in New Issue
Block a user