summaryrefslogtreecommitdiff
path: root/sql/slave.cc
diff options
context:
space:
mode:
authorSujatha <sujatha.sivakumar@mariadb.com>2020-11-12 15:39:02 +0530
committerSujatha <sujatha.sivakumar@mariadb.com>2020-11-12 15:39:02 +0530
commitb2029c0300bf8c311ff5d9fdc4b73a9e48bf6930 (patch)
tree54818fcbe17fc94f7c57580d5c2a2386cafe183b /sql/slave.cc
parent972dc6ee98b6447363ccbc5dcb921d3542d7d238 (diff)
parentbafb011a82c0a6437515c37e37aef433d043f592 (diff)
downloadmariadb-git-b2029c0300bf8c311ff5d9fdc4b73a9e48bf6930.tar.gz
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/slave.cc')
-rw-r--r--sql/slave.cc4
1 files changed, 2 insertions, 2 deletions
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