mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-35429 my_snprintf fixes for 10.5+

Browse source 
* Innobase `os0file.cc`: use `PRIu64` over `llu`
  * These came after I prepared #3485.
* MyISAM `mi_check.c`: in impossible block length warning
  * I missed this one in #3485 (and #3360 too?).
This commit is contained in:
ParadoxV5 2025-01-09 17:54:57 -07:00 committed by Daniel Black
parent 6868d965db
commit 200c235244
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/innobase/os/os0file.cc
View file

@ -1641,8 +1641,8 @@ bool os_file_set_size(const char *name, os_file_t file, os_offset_t size,
if (is_sparse) {
bool success = !ftruncate(file, size);
if (!success) {
sql_print_error("InnoDB: ftruncate of file %s"
" to %llu bytes failed with error %d",
sql_print_error("InnoDB: ftruncate of file %s to %"
PRIu64 " bytes failed with error %d",
name, size, errno);
}
return success;
@ -1680,7 +1680,7 @@ bool os_file_set_size(const char *name, os_file_t file, os_offset_t size,
case 0:
return true;
default:
sql_print_error("InnoDB: preallocating %llu"
sql_print_error("InnoDB: preallocating %" PRIu64
" bytes for file %s failed with error %d",
size, name, err);
/* fall through */

6
storage/myisam/mi_check.c
View file

@ -3429,9 +3429,9 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
{
if (!searching)
mi_check_print_info(param,
"Found block with impossible length %u at %s; Skipped",
block_info.block_len+ (uint) (block_info.filepos-pos),
llstr(pos,llbuff));
"Found block with impossible length %lu at %s; Skipped",
block_info.block_len + (unsigned long) (block_info.filepos-pos),
llstr(pos, llbuff));
if (found_record)
goto try_next;
searching=1;