summaryrefslogtreecommitdiff
path: root/storage/xtradb
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-03-10 16:25:01 +0100
committerSergei Golubchik <serg@mariadb.org>2017-03-10 18:21:22 +0100
commitb6a1d6538b4d2001be20fe0d8f470874c744f0a2 (patch)
treeab30243474522bc64cbdb8c19dd10ab10e21c782 /storage/xtradb
parent0094b6581df1530821608327df50b8479e1dc0f8 (diff)
downloadmariadb-git-b6a1d6538b4d2001be20fe0d8f470874c744f0a2.tar.gz
compiler warnings
Diffstat (limited to 'storage/xtradb')
-rw-r--r--storage/xtradb/log/log0crypt.cc4
-rw-r--r--storage/xtradb/os/os0file.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/storage/xtradb/log/log0crypt.cc b/storage/xtradb/log/log0crypt.cc
index dc9f3d577e6..e6b5c845757 100644
--- a/storage/xtradb/log/log0crypt.cc
+++ b/storage/xtradb/log/log0crypt.cc
@@ -145,11 +145,11 @@ log_crypt_print_checkpoint_keys(
if (crypt_info.size()) {
fprintf(stderr,
- "InnoDB: redo log checkpoint: %llu [ chk key ]: ",
+ "InnoDB: redo log checkpoint: " UINT64PF " [ chk key ]: ",
checkpoint_no);
for (size_t i = 0; i < crypt_info.size(); i++) {
struct crypt_info_t* it = &crypt_info[i];
- fprintf(stderr, "[ %llu %u ] ",
+ fprintf(stderr, "[ " UINT64PF " %u ] ",
it->checkpoint_no,
it->key_version);
}
diff --git a/storage/xtradb/os/os0file.cc b/storage/xtradb/os/os0file.cc
index 7b3b8800407..ed84834e6ea 100644
--- a/storage/xtradb/os/os0file.cc
+++ b/storage/xtradb/os/os0file.cc
@@ -6394,7 +6394,7 @@ os_file_trim(
srv_use_trim = FALSE;
ib_logf(IB_LOG_LEVEL_WARN,
"fallocate() failed with error %d."
- " start: %llu len: " ULINTPF " payload: " ULINTPF "."
+ " start: " UINT64PF " len: " ULINTPF " payload: " ULINTPF "."
" Disabling fallocate for now.",
errno, off, ulint(trim_len), ulint(len));