diff options
| author | Sujatha <sujatha.sivakumar@mariadb.com> | 2020-11-12 15:39:02 +0530 |
|---|---|---|
| committer | Sujatha <sujatha.sivakumar@mariadb.com> | 2020-11-12 15:39:02 +0530 |
| commit | b2029c0300bf8c311ff5d9fdc4b73a9e48bf6930 (patch) | |
| tree | 54818fcbe17fc94f7c57580d5c2a2386cafe183b | |
| parent | 972dc6ee98b6447363ccbc5dcb921d3542d7d238 (diff) | |
| parent | bafb011a82c0a6437515c37e37aef433d043f592 (diff) | |
| download | mariadb-git-b2029c0300bf8c311ff5d9fdc4b73a9e48bf6930.tar.gz | |
Merge branch '10.3' into 10.4
| -rw-r--r-- | sql/log.h | 2 | ||||
| -rw-r--r-- | sql/rpl_rli.cc | 4 | ||||
| -rw-r--r-- | sql/rpl_rli.h | 3 | ||||
| -rw-r--r-- | sql/slave.cc | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/sql/log.h b/sql/log.h index 4b80bdfd81f..8ba39614825 100644 --- a/sql/log.h +++ b/sql/log.h @@ -720,7 +720,7 @@ public: { bytes_written = 0; } - void harvest_bytes_written(ulonglong* counter) + void harvest_bytes_written(Atomic_counter<uint64> *counter) { #ifndef DBUG_OFF char buf1[22],buf2[22]; diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index 3a2fd5fc123..241d8321749 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -459,7 +459,7 @@ static inline int add_relay_log(Relay_log_info* rli,LOG_INFO* linfo) DBUG_RETURN(1); } rli->log_space_total += s.st_size; - DBUG_PRINT("info",("log_space_total: %llu", rli->log_space_total)); + DBUG_PRINT("info",("log_space_total: %llu", uint64(rli->log_space_total))); DBUG_RETURN(0); } @@ -1252,7 +1252,7 @@ int purge_relay_logs(Relay_log_info* rli, THD *thd, bool just_reset, mysql_mutex_unlock(rli->relay_log.get_log_lock()); } err: - DBUG_PRINT("info",("log_space_total: %llu",rli->log_space_total)); + DBUG_PRINT("info",("log_space_total: %llu", uint64(rli->log_space_total))); mysql_mutex_unlock(&rli->data_lock); DBUG_RETURN(error); } diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h index f89b40b1efc..1391c5cde82 100644 --- a/sql/rpl_rli.h +++ b/sql/rpl_rli.h @@ -240,7 +240,8 @@ public: threads, the SQL thread sets it to unblock the I/O thread and make it temporarily forget about the constraint. */ - ulonglong log_space_limit,log_space_total; + ulonglong log_space_limit; + Atomic_counter<uint64> log_space_total; bool ignore_log_space_limit; /* diff --git a/sql/slave.cc b/sql/slave.cc index f2e38c02ab5..9d4049c6452 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2781,7 +2781,7 @@ static bool wait_for_relay_log_space(Relay_log_info* rli) DBUG_PRINT("info", ("log_space_limit=%llu log_space_total=%llu " "ignore_log_space_limit=%d " "sql_force_rotate_relay=%d", - rli->log_space_limit, rli->log_space_total, + rli->log_space_limit, uint64(rli->log_space_total), (int) rli->ignore_log_space_limit, (int) rli->sql_force_rotate_relay)); } @@ -5039,7 +5039,7 @@ Stopping slave I/O thread due to out-of-memory error from master"); { DBUG_PRINT("info", ("log_space_limit=%llu log_space_total=%llu " "ignore_log_space_limit=%d", - rli->log_space_limit, rli->log_space_total, + rli->log_space_limit, uint64(rli->log_space_total), (int) rli->ignore_log_space_limit)); } #endif |