diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-23 10:10:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-23 10:10:08 +0300 |
| commit | fea8375893dcb400e0eb6ef78f30cb01b9edc19f (patch) | |
| tree | 10180608261831b74a2af2599d5fc72f98be6f77 | |
| parent | b857fde69ab7400181edd9d21fd943c156238ae9 (diff) | |
| download | mariadb-git-fea8375893dcb400e0eb6ef78f30cb01b9edc19f.tar.gz | |
MDEV-26195 fixup: Fix format mismatch
In commit ca501ffb04246dcaa1f1d433d916d8436e30602e 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.
| -rw-r--r-- | storage/innobase/dict/dict0load.cc | 8 | ||||
| -rw-r--r-- | storage/innobase/fil/fil0fil.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc index 0d8e21ebd1c..a4a5633adff 100644 --- a/storage/innobase/dict/dict0load.cc +++ b/storage/innobase/dict/dict0load.cc @@ -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); } @@ -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); diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index 48b19f0bb5d..8774acbf0f3 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -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)); } |