diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-25 17:17:21 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-25 17:17:21 +0300 |
commit | cbd0da66e48a2ea31917dae0b49a4ca6092959e7 (patch) | |
tree | 9efc2c0f3e1c0cd367255fce203c15190d13888f /extra/mariabackup/wsrep.cc | |
parent | a02551b0ba220cb138cf3e9cddd82539620c6432 (diff) | |
parent | 909cdafd35c05b56e47d2c791149a5dd85621870 (diff) | |
download | mariadb-git-cbd0da66e48a2ea31917dae0b49a4ca6092959e7.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'extra/mariabackup/wsrep.cc')
-rw-r--r-- | extra/mariabackup/wsrep.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/mariabackup/wsrep.cc b/extra/mariabackup/wsrep.cc index be11e058255..1cc16affbf2 100644 --- a/extra/mariabackup/wsrep.cc +++ b/extra/mariabackup/wsrep.cc @@ -194,7 +194,7 @@ xb_write_galera_info(bool incremental_prepare) fp = fopen(XB_GALERA_INFO_FILENAME, "w"); if (fp == NULL) { - msg("xtrabackup: error: " + msg("mariabackup: error: " "could not create " XB_GALERA_INFO_FILENAME ", errno = %d\n", errno); @@ -203,12 +203,12 @@ xb_write_galera_info(bool incremental_prepare) seqno = wsrep_xid_seqno(&xid); - msg("xtrabackup: Recovered WSREP position: %s:%lld\n", + msg("mariabackup: Recovered WSREP position: %s:%lld\n", uuid_str, (long long) seqno); if (fprintf(fp, "%s:%lld", uuid_str, (long long) seqno) < 0) { - msg("xtrabackup: error: " + msg("mariabackup: error: " "could not write to " XB_GALERA_INFO_FILENAME ", errno = %d\n", errno); |