diff options
author | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 10:58:20 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 10:58:20 +0100 |
commit | f2a0c758da3d9f0fa42c96114b453cf4835bcbab (patch) | |
tree | d51cdc29774cfc04f522e2253542d73c94a9728b /sql/wsrep_sst.cc | |
parent | fc168c3a5e58d8b364a2e87e0d876a261ec7fced (diff) | |
parent | d0116e10a5da52503a89a413e481996ce3f65e63 (diff) | |
download | mariadb-git-f2a0c758da3d9f0fa42c96114b453cf4835bcbab.tar.gz |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/wsrep_sst.cc')
-rw-r--r-- | sql/wsrep_sst.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index 1f8c9765c16..6ec9a589974 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -226,7 +226,7 @@ bool wsrep_sst_wait () total_wtime += difftime(end_time, start_time); WSREP_DEBUG("Waiting for SST to complete. current seqno: %" PRId64 " waited %f secs.", local_seqno, total_wtime); service_manager_extend_timeout(WSREP_EXTEND_TIMEOUT_INTERVAL, - "WSREP state transfer ongoing, current seqno: %ld waited %f secs", local_seqno, total_wtime); + "WSREP state transfer ongoing, current seqno: %" PRId64 " waited %f secs", local_seqno, total_wtime); } } @@ -1469,7 +1469,7 @@ void wsrep_SE_init_wait() total_wtime += difftime(end_time, start_time); WSREP_DEBUG("Waiting for SST to complete. current seqno: %" PRId64 " waited %f secs.", local_seqno, total_wtime); service_manager_extend_timeout(WSREP_EXTEND_TIMEOUT_INTERVAL, - "WSREP state transfer ongoing, current seqno: %ld waited %f secs", local_seqno, total_wtime); + "WSREP state transfer ongoing, current seqno: %" PRId64 " waited %f secs", local_seqno, total_wtime); } } |