MDEV-35478 part 2: Redo space_id format fix
#3651
Open
+2
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dr-m
approved these changes
Nov 22, 2024
Comment on lines
2300
to
2303
| 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); |
There was a problem hiding this comment.
I think that we could at the same time correct the last argument to table->name.str, like it was done in #3493. In any case, when or after that change has been merged from 10.6 to 10.11, we will have to pay attention to this.
There was a problem hiding this comment.
Sure, if it helps with conflict resolution
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
table->space_idisulinton 10.6 anduint32_ton 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).
Release Notes
N/A
Note that this’ll be a merge conflict if this merges before #3518 merges to 10.11.
How can this PR be tested?
N/A
Basing the PR against the correct MariaDB version
This is a new feature or a refactoring, and the PR is based against themainbranch.PR quality check