Skip to content

Commit

Permalink
MDEV-26195 fixup: Fix format mismatch
Browse files Browse the repository at this point in the history
In commit ca501ff we changed
some data types from ulint to uint32_t, but forgot to adjust
the format strings accordingly. On 64-bit Windows, this would
cause incorrect values to be output, with garbage<<32
added to the values.
  • Loading branch information
dr-m committed Jul 23, 2021
1 parent b857fde commit fea8375
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions storage/innobase/dict/dict0load.cc
Original file line number Diff line number Diff line change
Expand Up @@ -769,8 +769,8 @@ dict_sys_tables_rec_read(
if (!dict_sys_tables_type_valid(type, not_redundant)) {
sql_print_error("InnoDB: Table %.*s in InnoDB"
" data dictionary contains invalid flags."
" SYS_TABLES.TYPE=" ULINTPF
" SYS_TABLES.N_COLS=" ULINTPF,
" SYS_TABLES.TYPE=" UINT32PF
" SYS_TABLES.N_COLS=" UINT32PF,
name.size(), name.data(), type, *n_cols);
return(false);
}
Expand All @@ -794,8 +794,8 @@ dict_sys_tables_rec_read(
sql_print_error("InnoDB: Table %.*s in InnoDB"
" data dictionary"
" contains invalid flags."
" SYS_TABLES.TYPE=" ULINTPF
" SYS_TABLES.MIX_LEN=" ULINTPF,
" SYS_TABLES.TYPE=" UINT32PF
" SYS_TABLES.MIX_LEN=" UINT32PF,
name.size(), name.data(),
type, *flags2);
return(false);
Expand Down
2 changes: 1 addition & 1 deletion storage/innobase/fil/fil0fil.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1550,7 +1550,7 @@ fil_space_t *fil_space_t::check_pending_operations(uint32_t id)
return nullptr;
/* Issue a warning every 10.24 seconds, starting after 2.56 seconds */
if ((count & 511) == 128)
sql_print_warning("InnoDB: Waiting for tablespace " ULINTPF
sql_print_warning("InnoDB: Waiting for tablespace " UINT32PF
" to be deleted", id);
std::this_thread::sleep_for(std::chrono::milliseconds(20));
}
Expand Down

0 comments on commit fea8375

Please sign in to comment.