diff options
author | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 19:40:56 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 19:41:41 +0100 |
commit | 4e1d3f83b79cd5f3a920937b462e585fdfb5a35d (patch) | |
tree | 07e099b50109bd09ff8a5267c5cb5e0bf89597b4 /sql/wsrep_sst.cc | |
parent | a82cfe109cbc033253ddaba82f9c2de663601002 (diff) | |
parent | cc71e7501cb623b2d600c47dbe10a31dcf6e8fcf (diff) | |
download | mariadb-git-4e1d3f83b79cd5f3a920937b462e585fdfb5a35d.tar.gz |
Merge branch '10.2' into 10.3
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 902d78a2f33..92ca8fa748d 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -220,7 +220,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); } } @@ -1472,7 +1472,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); } } |