Details
Description
- CPU
- 10.4
- 10.5
- 10.4
- PCRE2 (update url in cmake/pcre.cmake)
PCRE2-10.43
- ColumnStore 5.x
nothing new
- merge with the main branch
- 10.4
- 10.6
- 10.5
- C/C v3.3
923a0092
- ask Georg if everything is pushed for a release
- ask Georg if everything is pushed for a release
- ColumnStore 6.x
6.4.8-2
- merge with the main branch
- 10.5
- 10.11
- 10.6
- merge with the main branch
- 10.6
- 11.0
- 10.11
- merge with the main branch
- 10.11
- 11.1
- 11.0
- ColumnStore 23.x
23.10.1 a81afdaf5
- merge with the main branch
- 11.2
- 11.1
- merge with the main branch
- 11.1
- 11.4
- 11.2
- must be 11.4.2-stable
- C/C v3.4
cc985fab
- ask Georg if everything is pushed for a release
- ask Georg if everything is pushed for a release
- merge with the main branch
- 11.2
- 11.5
- 11.4
- must be 11.5.1-gamma
- verify that all preview features are pushed
- merge with the main branch
- 11.4
- Documentation task with these tasks
Attachments
Issue Links
- causes
-
MDEV-34145 Q2 2024 release documentation
-
- Open
-
- relates to
-
MDEV-33264 Q1 2024 release merge
-
- Closed
-
In the 10.4 -> 10.5 merge there are conflicts in main/kill_processlist-6619.
{test,result}, these should be resolved by choosing the version from 10.4. The reason for the conflict is that a fix ae063e4ff58 was cherry-picked into 10.4 from a later branch.
(I wasn't able to merge the conflict myself as I got a failure in main.commit_1innodb that I'm not sure how to resolve).