Commit b6a1d653 authored by Sergei Golubchik's avatar Sergei Golubchik

compiler warnings

parent 0094b658
......@@ -1034,7 +1034,7 @@ char *GetListOption(PGLOBAL g, const char *opname,
pv= strchr(pk, '=');
if (pv && (!pn || pv < pn)) {
n= MY_MIN(pv - pk, sizeof(key) - 1);
n= MY_MIN(static_cast<size_t>(pv - pk), sizeof(key) - 1);
memcpy(key, pk, n);
key[n]= 0;
pv++;
......
......@@ -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);
}
......
......@@ -6280,7 +6280,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));
......
......@@ -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);
}
......
......@@ -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));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment