diff options
author | Sergei Golubchik <serg@mariadb.org> | 2019-03-16 19:24:49 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-27 22:51:37 +0100 |
commit | f97d879bf890fe1d93c459f46410e2be8d26d3b6 (patch) | |
tree | 948a0951ebc0b32f9ed4b61aebf7143355a7a815 /sql/wsrep_sst.cc | |
parent | 1a4746e1285bbe03d616310cd49c3548825d5a1a (diff) | |
download | mariadb-git-f97d879bf890fe1d93c459f46410e2be8d26d3b6.tar.gz |
cmake: re-enable -Werror in the maintainer mode
now we can afford it. Fix -Werror errors. Note:
* old gcc is bad at detecting uninit variables, disable it.
* time_t is int or long, cast it for printf's
Diffstat (limited to 'sql/wsrep_sst.cc')
-rw-r--r-- | sql/wsrep_sst.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index e2c55583594..addbfeb99f6 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -231,7 +231,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); } } @@ -294,9 +294,8 @@ void wsrep_sst_received (wsrep_t* const wsrep, } else if (local_seqno > seqno) { - WSREP_WARN("SST postion is in the past: %lld, current: %lld. " - "Can't continue.", - (long long)seqno, (long long)local_seqno); + WSREP_WARN("SST postion is in the past: %" PRId64 ", current: %" PRId64 + ". Can't continue.", seqno, local_seqno); unireg_abort(1); } @@ -1416,7 +1415,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); } } |