diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-21 12:29:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-21 12:29:00 +0300 |
| commit | 3a423088ac4f854448803d8af14e0d176b08f0af (patch) | |
| tree | 2c1cb172aa2457993b98eeb4152298089b340d36 /extra | |
| parent | 29847a37363ad439639dd414ec9f76a6678130d9 (diff) | |
| parent | fba6ffe433fdba7aa397f1de8eb4ee0a74f55800 (diff) | |
| download | mariadb-git-3a423088ac4f854448803d8af14e0d176b08f0af.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/backup_mysql.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc index e008b2352a7..4c0ef77760c 100644 --- a/extra/mariabackup/backup_mysql.cc +++ b/extra/mariabackup/backup_mysql.cc @@ -1092,6 +1092,7 @@ write_slave_info(MYSQL *connection) char *master = NULL; char *filename = NULL; char *gtid_executed = NULL; + char *using_gtid = NULL; char *position = NULL; char *gtid_slave_pos = NULL; char *ptr; @@ -1102,6 +1103,7 @@ write_slave_info(MYSQL *connection) {"Relay_Master_Log_File", &filename}, {"Exec_Master_Log_Pos", &position}, {"Executed_Gtid_Set", >id_executed}, + {"Using_Gtid", &using_gtid}, {NULL, NULL} }; @@ -1142,7 +1144,8 @@ write_slave_info(MYSQL *connection) ut_a(asprintf(&mysql_slave_position, "master host '%s', purge list '%s'", master, gtid_executed) != -1); - } else if (gtid_slave_pos && *gtid_slave_pos) { + } else if (gtid_slave_pos && *gtid_slave_pos && + !(using_gtid && !strncmp(using_gtid, "No", 2))) { /* MariaDB >= 10.0 with GTID enabled */ result = backup_file_printf(XTRABACKUP_SLAVE_INFO, "SET GLOBAL gtid_slave_pos = '%s';\n" |