Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MDEV-35478 Correction for table->space_id in dict_load_tablespace() was mistakenly applied on an earlier branch #3650

Open
wants to merge 1 commit into
base: 10.6
Choose a base branch
from
Open

MDEV-35478 Correction for table->space_id in dict_load_tablespace() was mistakenly applied on an earlier branch #3650

wants to merge 1 commit into from
+2 −2

Conversation

ParadoxV5
Copy link
Contributor

@ParadoxV5 ParadoxV5 commented Nov 21, 2024 •
edited
Loading

  • The Jira issue number for this PR is: MDEV-35478

Description

It is ulint on 10.6 and uint32_t on 10.11+, but I included its format specifier change in 10.6 (MDEV-35430, merged #3493) rather than 10.11.
This commit reverts that change so 10.11 can reapply it.

Release Notes

N/A

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 the main branch.
  • This is a bug fix, and the PR is based against the earliest maintained branch in which the bug can be reproduced.

PR quality check

  • I checked the CODING_STANDARDS.md file and my PR conforms to this where appropriate.
  • For any trivial modifications to the PR, I am ok with the reviewer making the changes themselves.

@ParadoxV5 ParadoxV5 requested a review from dr-m November 21, 2024 21:43
@ParadoxV5
MDEV-35478 Correction for table->space_id in dict_load_tablespace() w…
b402fe3 
…as mistakenly applied on an earlier branch

It is `ulint` on 10.6 and `uint32_t` on 10.11+, but I included its
format specifier change in 10.6 (MDEV-35430, merged #3493) rather
than 10.11. This commit reverts that change so 10.11 can reapply it.
ParadoxV5 added a commit that referenced this pull request Nov 21, 2024
@ParadoxV5
MDEV-35478 part 2: Redo space_id format fix
de367a3 
`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).
@ParadoxV5 ParadoxV5 mentioned this pull request Nov 21, 2024
Open
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dr-m dr-m dr-m approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ParadoxV5 @dr-m