diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 15:06:25 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 15:06:25 +0200 |
| commit | cae5a0328bd70fa1bc877fc35fecc704fdb6f6cb (patch) | |
| tree | 8d4f7cd1c17be55f899e20a20f4b4f0b86a5fd53 /extra/mariabackup/backup_mysql.cc | |
| parent | 66f7f7998ceae4b6274c5e84738b2c0c8dfa3064 (diff) | |
| parent | 820ebcec8651d2478ece554f059a5513f0b2bedf (diff) | |
| download | mariadb-git-cae5a0328bd70fa1bc877fc35fecc704fdb6f6cb.tar.gz | |
Merge 10.9 into 10.10
Diffstat (limited to 'extra/mariabackup/backup_mysql.cc')
| -rw-r--r-- | extra/mariabackup/backup_mysql.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc index 9a09da21d74..ae7d4583c69 100644 --- a/extra/mariabackup/backup_mysql.cc +++ b/extra/mariabackup/backup_mysql.cc @@ -1374,14 +1374,18 @@ write_galera_info(MYSQL *connection) if ((state_uuid == NULL && state_uuid55 == NULL) || (last_committed == NULL && last_committed55 == NULL)) { - msg("Failed to get master wsrep state from SHOW STATUS."); - result = false; + msg("Warning: failed to get master wsrep state from SHOW STATUS."); + result = true; goto cleanup; } result = backup_file_printf(XTRABACKUP_GALERA_INFO, "%s:%s\n", state_uuid ? state_uuid : state_uuid55, last_committed ? last_committed : last_committed55); + if (result) + { + write_current_binlog_file(connection); + } cleanup: free_mysql_variables(status); |