Skip to content

Fix #18204 - Remove getInnodbPluginVersion() and refactor getInnodbFileFormat() for MariaDB compatibility#20262

Merged
williamdes merged 10 commits intophpmyadmin:QA_5_2from
gs71:QA_5_2
Apr 9, 2026
Merged

Fix #18204 - Remove getInnodbPluginVersion() and refactor getInnodbFileFormat() for MariaDB compatibility#20262
williamdes merged 10 commits intophpmyadmin:QA_5_2from
gs71:QA_5_2

Conversation

@gs71
Copy link
Copy Markdown
Contributor

@gs71 gs71 commented Mar 31, 2026

Description

Starting from version 10.10 MariaDB removed the system variable 'innodb_version' (https://jira.mariadb.org/browse/MDEV-28554), so clicking on the 'Operations' link produces an error in the SQL errors log (if enabled):

ERROR 1193: Unknown system variable 'innodb_version' : SELECT @@innodb_version

Fixes #18204

Before submitting pull request, please review the following checklist:

  • Make sure you have read our CONTRIBUTING.md document.
  • Make sure you are making a pull request against the correct branch. For example, for bug fixes in a released version use the corresponding QA branch and for new features use the master branch. If you have a doubt, you can ask as a comment in the bug report or on the mailing list.
  • Every commit has proper Signed-off-by line as described in our DCO. This ensures that the work you're submitting is your own creation.
  • Every commit has a descriptive commit message.
  • Every commit is needed on its own, if you have just minor fixes to previous commits, you can squash them.
  • Any new functionality is covered by tests.

gs71 added 2 commits March 31, 2026 17:37
@gs71
Refactor InnoDB file format retrieval logic
0442469 
Simplified retrieval of InnoDB file format by removing unnecessary version check.

Signed-off-by: Guido Selva guido.selva@gmail.com
@gs71
Refactor InnoDB methods for version handling
45fdf31 
Removed the getInnodbPluginVersion method and updated the getInnodbFileFormat method to handle version checks for MariaDB and MySQL.

Signed-off-by: Guido Selva guido.selva@gmail.com
@codacy-production
Copy link
Copy Markdown

codacy-production bot commented Mar 31, 2026 •
edited
Loading

Up to standards ✅

🟢 Issues 0 issues

Results:
0 new issues

View in Codacy

🟢 Metrics 0 complexity · 0 duplication

Metric Results
Complexity 0
Duplication 0

View in Codacy

TIP This summary will be updated as you push new changes. Give us feedback

gs71 added 8 commits March 31, 2026 19:02
@gs71
Remove return type hint from getInnodbFileFormat
bcea844 
Remove type hinting from getInnodbFileFormat method.

Signed-off-by: Guido Selva guido.selva@gmail.com
@gs71
Update query for fetching innodb_file_format
0bbe314 
Signed-off-by: Guido Selva guido.selva@gmail.com
@gs71
Remove testGetInnodbPluginVersion from InnodbTest
d20243e 
Removed test for getInnodbPluginVersion method.

Signed-off-by: Guido Selva guido.selva@gmail.com
@gs71
Fix fetchValue call for innodb_file_format
885230c 
Signed-off-by: Guido Selva guido.selva@gmail.com
@gs71
Refactor getInnodbFileFormat return statement
64f68da 
Signed-off-by: Guido Selva guido.selva@gmail.com
@gs71
Refactor conditional check for MySQL version
d6d0685 
Signed-off-by: Guido Selva guido.selva@gmail.com
@gs71
Refactor conditional check for MySQL version
6b84c29 
Signed-off-by: Guido Selva guido.selva@gmail.com
@gs71
Fix conditional logic for MySQL version check
4bf3505 
Signed-off-by: Guido Selva guido.selva@gmail.com
@williamdes williamdes mentioned this pull request Apr 1, 2026
Closed
6 tasks
williamdes added a commit that referenced this pull request Apr 9, 2026
@williamdes
Add tests for #20262
fa168ab 
Pull-request: #20262
Ref: #18204

Signed-off-by: William Desportes <williamdes@wdes.fr>
@williamdes williamdes merged commit 9d2f4c7 into phpmyadmin:QA_5_2 Apr 9, 2026
50 of 53 checks passed
@williamdes williamdes self-assigned this Apr 9, 2026
@williamdes williamdes added this to the 5.2.4 milestone Apr 9, 2026
@williamdes
Copy link
Copy Markdown
Member

williamdes commented Apr 9, 2026

Merged as 9d2f4c7 with some changes

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@williamdes williamdes

Labels

None yet

Projects

None yet

Milestone

5.2.4

Development

Successfully merging this pull request may close these issues.

3 participants

@gs71 @williamdes @phpmyadmin-bot