From e81ed928ff57658d71be360813a87325fbda8e03 Mon Sep 17 00:00:00 2001 From: ParadoxV5 Date: Thu, 21 Nov 2024 14:48:59 -0700 Subject: [PATCH] MDEV-35478 part 2: Redo `space_id` format fix `table->space_id` is `ulint` on 10.6 and `uint32_t` on 10.11+, but I included its format specifier change in 10.6 rather than 10.11. PR #3650 reverts the change from 10.6; this commit reapplies it on 10.11 as a follow up on its batch (MDEV-35431, merged #3518). --- storage/innobase/dict/dict0load.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc index 8c605bb887d..2bf8da74a9f 100644 --- a/storage/innobase/dict/dict0load.cc +++ b/storage/innobase/dict/dict0load.cc @@ -2298,8 +2298,8 @@ dict_load_tablespace( table->file_unreadable = true; if (!(ignore_err & DICT_ERR_IGNORE_RECOVER_LOCK)) { - sql_print_error("InnoDB: Failed to load tablespace " - ULINTPF " for table %s", + sql_print_error("InnoDB: Failed to load tablespace %" + PRIu32 " for table %s", table->space_id, table->name); } }