Commit ff4209fa0d1c66952bc9f00587f525314464e7be not merged on main?
Hi! I was updating the patch https://salsa.debian.org/mariadb-team/mariadb-server/-/blob/debian/latest/de... in Debian when importing MariaDB 11.4.6, and I noticed that the upstream commit that changes the same lines in https://github.com/MariaDB/server/commit/ff4209fa0d1c66952bc9f00587f52531446... only landed on MariaDB '10.11' and '11.4' branch, but never on 'main' or '11.8'. Could it be that 'main' has had zero merges from older branches since April 3? Or was there maybe some mistake and one merge was overlooked and it wasn't properly applied on all newer maintained branches?
The status of the release merge is on https://jira.mariadb.org/browse/MDEV-36519 which lists the merges to 11.8 and main as not complete yet. They are ticked when completed. On Thu, 8 May 2025 at 14:24, Otto Kekäläinen via developers < developers@lists.mariadb.org> wrote:
Hi!
I was updating the patch
https://salsa.debian.org/mariadb-team/mariadb-server/-/blob/debian/latest/de... in Debian when importing MariaDB 11.4.6, and I noticed that the upstream commit that changes the same lines in
https://github.com/MariaDB/server/commit/ff4209fa0d1c66952bc9f00587f52531446... only landed on MariaDB '10.11' and '11.4' branch, but never on 'main' or '11.8'.
Could it be that 'main' has had zero merges from older branches since April 3? Or was there maybe some mistake and one merge was overlooked and it wasn't properly applied on all newer maintained branches? _______________________________________________ developers mailing list -- developers@lists.mariadb.org To unsubscribe send an email to developers-leave@lists.mariadb.org
The status of the release merge is on https://jira.mariadb.org/browse/MDEV-36519 which lists the merges to 11.8 and main as not complete yet.
They are ticked when completed.
Thanks for reference! I was a bit surprised that there can be such a large delay between merges. For visibility, posting links to all Debian/Ubuntu stable updates in review now: * MariaDB 11.4.6 to Ubuntu 25.04 "Plucky": https://salsa.debian.org/mariadb-team/mariadb-server/-/merge_requests/121 * MariaDB 10.11.12 to Debian 12 "Bookworm": https://salsa.debian.org/mariadb-team/mariadb-server/-/merge_requests/119 * MariaDB 10.11.12 to Ubuntu 24.04 "Noble": https://salsa.debian.org/mariadb-team/mariadb-server/-/merge_requests/120 * MariaDB 10.6.22 to Ubuntu 22.04 "Jammy": https://salsa.debian.org/mariadb-team/mariadb-server/-/merge_requests/118 * MariaDB 10.5.29 for Debian 11 "Bullseye": https://salsa.debian.org/mariadb-team/mariadb-10.5/-/merge_requests/22
participants (2)
-
Daniel Black -
Otto Kekäläinen