Skip to content

PS-11624 [trunk] clang-format Percona-modified sources - #6213

Merged
inikep merged 1 commit into
percona:trunkfrom
inikep:PS-11624-trunk
Oct 6, 2026
Merged

inikep merged 1 commit into
percona:trunkfrom
inikep:PS-11624-trunk

Conversation

@inikep

@inikep inikep commented Oct 5, 2026 •

Copy link
Copy Markdown
Collaborator

https://perconadev.atlassian.net/browse/PS-11624

Port of #6212 to trunk.

No functional change. Apply the repository .clang-format with clang-format 15, the version it names ("We currently use clang-format version 15."), to every C/C++ file that Percona added or modified relative to mysql-26.7.0 (132 files needed changes).

  • Cherry-pick of the 9.7 commit. Conflicts in fil0fil.h, os0file.ic, trx0trx.h, ut0new.h and log0recv.cc were resolved by formatting the trunk version of the file instead of taking the 9.7 one.
  • Six files whose Percona changes differ between 9.7 and trunk were still unformatted on trunk and are formatted here too: buf0rea.cc, fsp0sysspace.cc, fil0innodb_tablespace_node_handle.h, os0file.h, os0file.cc, srv0start.cc.
  • Every changed file is exactly clang-format 15 applied to its trunk version, so nothing from 9.7 other than formatting comes along.
  • As in PS-11624 [9.7] clang-format Percona-modified sources #6212, storage/innobase/fts/fts0pars.cc and the other flex/bison outputs (fts0blex.cc, fts0tlex.cc, lexyy.cc, pars0grm.cc) are not touched. sql/dd/impl/system_registry.cc and sql/sql_union.cc are stable under a whole-file clang-format --dry-run.

Not built locally yet.

Implemented-by: Opus 5.5 high

https://perconadev.atlassian.net/browse/PS-11624

No functional change. Apply the repository .clang-format with
clang-format 15, the version it names ("We currently use clang-format
version 15."), to every C/C++ file that Percona added or modified
relative to mysql-26.7.0. Upstream code in these files was already
clang-format 15 clean, so only Percona-introduced formatting changes.

storage/innobase/fts/fts0pars.cc is left as is: it is bison-generated
and upstream does not format it.

(cherry picked from commit 1ce3047)
@inikep
inikep merged commit 4a8d03d into percona:trunk Oct 6, 2026
17 checks passed
@inikep
inikep deleted the PS-11624-trunk branch October 6, 2026 07:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant