Skip to content

slack-22.0: merge v22.0.1 patch release #672

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
Merged
timvaillancourt merged 24 commits into from
Jun 18, 2025
Merged

slack-22.0: merge v22.0.1 patch release #672

timvaillancourt merged 24 commits into from
Jun 18, 2025

Conversation

@timvaillancourt
Copy link

@timvaillancourt timvaillancourt commented Jun 18, 2025 •
edited
Loading

Description

This PR merges the upstream v22.0.1 patch release onto slack-22.0

Related Issue(s)

Checklist

  • "Backport to:" labels have been added if this change should be back-ported to release branches
  • If this change is to be back-ported to previous releases, a justification is included in the PR description
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on CI?
  • Documentation was added or is not required

Deployment Notes

vitess-bot and others added 22 commits May 5, 2025 07:08
@vitess-bot @frouioui
[release-22.0] Bump to v22.0.1-SNAPSHOT after the v22.0.0 release (…
3526af4 
…vitessio#18225)

Signed-off-by: Florent Poinsard <[email protected]>
Co-authored-by: Florent Poinsard <[email protected]>
@vitess-bot @harshit-gangal
[release-22.0] fix: Preserve multi-column TupleExpr in tuple simplifi…
60dc6c3 
…er (vitessio#18216) (vitessio#18220)

Signed-off-by: Harshit Gangal <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Harshit Gangal <[email protected]>
@vitess-bot @mhamza15
[release-22.0] Properly handle grpc dial errors in the throttler metr…
45885b2 
…ic aggregation (vitessio#18073) (vitessio#18231)

Signed-off-by: Arthur Schreiber <[email protected]>
Signed-off-by: Mohamed Hamza <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Mohamed Hamza <[email protected]>
@vitess-bot
[release-22.0] test: TestQueryTimeoutWithShardTargeting fix flaky test (
5447a26 
vitessio#18242) (vitessio#18250)

Signed-off-by: Harshit Gangal <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
@vitess-bot @systay
[release-22.0] make sure to give MEMBER OF the correct precedence (vi…
2df1246 
…tessio#18237) (vitessio#18245)

Signed-off-by: Andres Taylor <[email protected]>
Co-authored-by: Andrés Taylor <[email protected]>
@vitess-bot
[release-22.0] Fix evalengine crashes on unexpected types (vitessio#1…
aadd478 
…8254) (vitessio#18258)

Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
@vitess-bot @systay
[release-22.0] Fix subquery merging regression introduced in vitessio…
80cd8ee 
…#11379 (vitessio#18260) (vitessio#18263)

Signed-off-by: Arthur Schreiber <[email protected]>
Co-authored-by: Andrés Taylor <[email protected]>
@vitess-bot @harshit-gangal
[release-22.0] json array insert test (vitessio#18284) (vitessio#18286)
cab2193 
Signed-off-by: Harshit Gangal <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Harshit Gangal <[email protected]>
@vitess-bot
[release-22.0] Fix SET and START TRANSACTION in create procedure …
70463c4 
…statements (vitessio#18279) (vitessio#18293)

Signed-off-by: Manan Gupta <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
@vitess-bot
[release-22.0] Fix deadlock in semi-sync monitor (vitessio#18276) (vi…
bbe1f7f 
…tessio#18290)

Signed-off-by: Manan Gupta <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
@vitess-bot @frouioui @systay
[release-22.0] Upgrade the Golang version to go1.24.3 (vitessio#18239)
419f5ed 
Signed-off-by: GitHub <[email protected]>
Signed-off-by: Andres Taylor <[email protected]>
Co-authored-by: frouioui <[email protected]>
Co-authored-by: Andres Taylor <[email protected]>
@vitess-bot
[release-22.0] Atomic Copy: Handle error that was ignored while strea…
765f62d 
…ming tables and log it (vitessio#18313) (vitessio#18316)

Signed-off-by: Rohit Nayak <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
@vitess-bot @harshit-gangal
[release-22.0] fix: handle dml query for None opcode (vitessio#18326) (…
e361adb 
…vitessio#18345)

Signed-off-by: Harshit Gangal <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Harshit Gangal <[email protected]>
@vitess-bot @systay
[release-22.0] fix: keep LIMIT/OFFSET even when merging UNION queries (…
045847a 
…vitessio#18361) (vitessio#18363)

Signed-off-by: Andres Taylor <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Andres Taylor <[email protected]>
@vitess-bot
[release-22.0] Fix: Deadlock in Close and write in semi-sync moni…
610534d 
…tor. (vitessio#18359) (vitessio#18368)

Signed-off-by: Manan Gupta <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
@vitess-bot @frouioui @GuptaManan100
[release-22.0] Upgrade the Golang version to go1.24.4 (vitessio#18329)
cb625b4 
Signed-off-by: GitHub <[email protected]>
Signed-off-by: Manan Gupta <[email protected]>
Co-authored-by: frouioui <[email protected]>
Co-authored-by: Manan Gupta <[email protected]>
@vitess-bot
[release-22.0] fix version issue when using --mysql-shell-speedup-res…
2bc88c5 
…tore=true (vitessio#18310) (vitessio#18356)

Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
@vitess-bot
[release-22.0] Split workflow with flaky vdiff2 e2e test. Skip flaky …
4e9c8ac 
…Migrate test. (vitessio#18300) (vitessio#18334)

Signed-off-by: Rohit Nayak <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
@vitess-bot
[release-22.0] Throttler: keep watching topo even on error (vitessio#…
3d1e0f8 
…18223) (vitessio#18322)

Signed-off-by: Shlomi Noach <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
@GuptaManan100
[release-22.0] Code Freeze for v22.0.1 (vitessio#18374)
88f98ff 
Signed-off-by: Manan Gupta <[email protected]>
@GuptaManan100
[release-22.0] Release of v22.0.1 (vitessio#18375)
aafd403 
Signed-off-by: Manan Gupta <[email protected]>
@timvaillancourt
Merge tag 'v22.0.1' into v22.0.1.slack-22.0
91da5da 
Signed-off-by: Tim Vaillancourt <[email protected]>
@salesforce-cla
Copy link

salesforce-cla bot commented Jun 18, 2025

Thanks for the contribution! Before we can merge this, we need @vitess-bot @GuptaManan100 to sign the Salesforce Inc. Contributor License Agreement.

@github-actions github-actions bot added this to the v22.0.0 milestone Jun 18, 2025
@timvaillancourt timvaillancourt self-assigned this Jun 18, 2025
@ejortegau
Copy link

ejortegau commented Jun 18, 2025

Lots of failing tests, is it expected?

@timvaillancourt
Copy link
Author

timvaillancourt commented Jun 18, 2025

Lots of failing tests, is it expected?

@ejortegau the downgrade CI failures are expected as we still need to update CI tests (or slack-19.0) to be compatible with the v19->v22 jump. Same with v21

@timvaillancourt timvaillancourt marked this pull request as ready for review June 18, 2025 12:38
@timvaillancourt
make generate_ci_workflows
574d080 
Signed-off-by: Tim Vaillancourt <[email protected]>
@timvaillancourt timvaillancourt merged commit 85f4346 into slack-22.0 Jun 18, 2025
180 of 191 checks passed
@timvaillancourt timvaillancourt deleted the v22.0.1.slack-22.0 branch June 18, 2025 13:32
tanjinx pushed a commit that referenced this pull request Nov 10, 2025
@timvaillancourt @vitess-bot
@frouioui @vitess-bot @harshit-gangal @mhamza15 @systay @GuptaManan100 @tanjinx
slack-22.0: merge v22.0.1 patch release (#672)
c214e7e 
* [release-22.0] Bump to `v22.0.1-SNAPSHOT` after the `v22.0.0` release (vitessio#18225)

Signed-off-by: Florent Poinsard <[email protected]>
Co-authored-by: Florent Poinsard <[email protected]>

* [release-22.0] fix: Preserve multi-column TupleExpr in tuple simplifier (vitessio#18216) (vitessio#18220)

Signed-off-by: Harshit Gangal <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Harshit Gangal <[email protected]>

* [release-22.0] Properly handle grpc dial errors in the throttler metric aggregation (vitessio#18073) (vitessio#18231)

Signed-off-by: Arthur Schreiber <[email protected]>
Signed-off-by: Mohamed Hamza <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Mohamed Hamza <[email protected]>

* [release-22.0] test: TestQueryTimeoutWithShardTargeting fix flaky test (vitessio#18242) (vitessio#18250)

Signed-off-by: Harshit Gangal <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] make sure to give MEMBER OF the correct precedence (vitessio#18237) (vitessio#18245)

Signed-off-by: Andres Taylor <[email protected]>
Co-authored-by: Andrés Taylor <[email protected]>

* [release-22.0] Fix evalengine crashes on unexpected types (vitessio#18254) (vitessio#18258)

Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Fix subquery merging regression introduced in vitessio#11379 (vitessio#18260) (vitessio#18263)

Signed-off-by: Arthur Schreiber <[email protected]>
Co-authored-by: Andrés Taylor <[email protected]>

* [release-22.0] json array insert test (vitessio#18284) (vitessio#18286)

Signed-off-by: Harshit Gangal <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Harshit Gangal <[email protected]>

* [release-22.0] Fix `SET` and `START TRANSACTION` in create procedure statements (vitessio#18279) (vitessio#18293)

Signed-off-by: Manan Gupta <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Fix deadlock in semi-sync monitor (vitessio#18276) (vitessio#18290)

Signed-off-by: Manan Gupta <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Upgrade the Golang version to `go1.24.3` (vitessio#18239)

Signed-off-by: GitHub <[email protected]>
Signed-off-by: Andres Taylor <[email protected]>
Co-authored-by: frouioui <[email protected]>
Co-authored-by: Andres Taylor <[email protected]>

* [release-22.0] Atomic Copy: Handle error that was ignored while streaming tables and log it (vitessio#18313) (vitessio#18316)

Signed-off-by: Rohit Nayak <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] fix: handle dml query for None opcode (vitessio#18326) (vitessio#18345)

Signed-off-by: Harshit Gangal <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Harshit Gangal <[email protected]>

* [release-22.0] fix: keep LIMIT/OFFSET even when merging UNION queries (vitessio#18361) (vitessio#18363)

Signed-off-by: Andres Taylor <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Andres Taylor <[email protected]>

* [release-22.0] Fix: Deadlock in `Close` and `write` in semi-sync monitor. (vitessio#18359) (vitessio#18368)

Signed-off-by: Manan Gupta <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Upgrade the Golang version to `go1.24.4` (vitessio#18329)

Signed-off-by: GitHub <[email protected]>
Signed-off-by: Manan Gupta <[email protected]>
Co-authored-by: frouioui <[email protected]>
Co-authored-by: Manan Gupta <[email protected]>

* [release-22.0] fix version issue when using --mysql-shell-speedup-restore=true (vitessio#18310) (vitessio#18356)

Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Split workflow with flaky vdiff2 e2e test. Skip flaky Migrate test. (vitessio#18300) (vitessio#18334)

Signed-off-by: Rohit Nayak <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Throttler: keep watching topo even on error (vitessio#18223) (vitessio#18322)

Signed-off-by: Shlomi Noach <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Code Freeze for `v22.0.1` (vitessio#18374)

Signed-off-by: Manan Gupta <[email protected]>

* [release-22.0] Release of `v22.0.1` (vitessio#18375)

Signed-off-by: Manan Gupta <[email protected]>

* add private repo config to new CI file

Signed-off-by: Tim Vaillancourt <[email protected]>

* `make generate_ci_workflows`

Signed-off-by: Tim Vaillancourt <[email protected]>

---------

Signed-off-by: Florent Poinsard <[email protected]>
Signed-off-by: Harshit Gangal <[email protected]>
Signed-off-by: Arthur Schreiber <[email protected]>
Signed-off-by: Mohamed Hamza <[email protected]>
Signed-off-by: Andres Taylor <[email protected]>
Signed-off-by: Manan Gupta <[email protected]>
Signed-off-by: GitHub <[email protected]>
Signed-off-by: Rohit Nayak <[email protected]>
Signed-off-by: Shlomi Noach <[email protected]>
Signed-off-by: Tim Vaillancourt <[email protected]>
Co-authored-by: vitess-bot <[email protected]>
Co-authored-by: Florent Poinsard <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Harshit Gangal <[email protected]>
Co-authored-by: Mohamed Hamza <[email protected]>
Co-authored-by: Andrés Taylor <[email protected]>
Co-authored-by: frouioui <[email protected]>
Co-authored-by: Manan Gupta <[email protected]>
Co-authored-by: Manan Gupta <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ejortegau ejortegau ejortegau approved these changes

Assignees

@timvaillancourt timvaillancourt

Labels

cla:missing upstream-backport An upstream backport v22-backport v22

Projects

None yet

Milestone

v22.0.0

Development

Successfully merging this pull request may close these issues.

5 participants

@timvaillancourt @ejortegau @vitess-bot @GuptaManan100