Skip to content

Comments

git merge upstream/main up to eab8588e1f4c211d4e4b92870a73cdff99f42d9f#694

Merged
sbaker617 merged 8 commits intomainfrom
henry-main
Sep 4, 2025
Merged

git merge upstream/main up to eab8588e1f4c211d4e4b92870a73cdff99f42d9f#694
sbaker617 merged 8 commits intomainfrom
henry-main

Conversation

@HenryCaiHaiying
Copy link

@HenryCaiHaiying HenryCaiHaiying commented Aug 25, 2025

Description

git merge upstream/main up to this commit:

commit eab8588e1f4c211d4e4b92870a73cdff99f42d9f (HEAD -> main, origin/main, origin/HEAD)
Author: vitess-go-upgrade-bot <139342327+vitess-bot@users.noreply.github.com>
Date:   Mon Aug 25 14:55:34 2025 +0200

    [main] Upgrade the Golang version to `go1.25.0` (#18573)
    
    Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
    Co-authored-by: dbussink <7851+dbussink@users.noreply.github.com>
    Co-authored-by: Dirkjan Bussink <d.bussink@gmail.com>

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

harshit-gangal and others added 8 commits August 11, 2025 12:49
@harshit-gangal
Fix foreign key relation with routed tables (vitessio#18537)
f27b909 
Signed-off-by: Harshit Gangal <harshit@planetscale.com>
@shlomi-noach
Online DDL: set migration's progress to 100% once it's `ready_to_comp…
8d90d26 
…lete` (vitessio#18544)

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
@HenryCaiHaiying
Add support for querylog-emit-on-any-condition-met flag (vitessio#18546)
c336ea3 
Signed-off-by: Henry Cai <henry.cai@slack-corp.com>
@shlomi-noach
OnlineDDL: log changes to ready_to_complete (vitessio#18557)
de17a2d 
Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
@shlomi-noach
heartbeatWriter: wrap error with more info (vitessio#18538)
c8d71bc 
Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
@chapsuk @arthurschreiber
Pass envs to mysqld process (vitessio#18561)
104b755 
Signed-off-by: Maxim Krasilnikov <mak.krasilnikov@gmail.com>
Co-authored-by: Arthur Schreiber <arthurschreiber@github.com>
@dbussink
Try updating the create PR workflow step (vitessio#18563)
380e6c8 
Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
@vitess-bot @dbussink
[main] Upgrade the Golang version to go1.25.0 (vitessio#18573)
eab8588 
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Co-authored-by: dbussink <7851+dbussink@users.noreply.github.com>
Co-authored-by: Dirkjan Bussink <d.bussink@gmail.com>
@salesforce-cla
Copy link

salesforce-cla bot commented Aug 25, 2025

Thanks for the contribution! Before we can merge this, we need @vitess-bot @chapsuk @harshit-gangal @shlomi-noach @dbussink to sign the Salesforce Inc. Contributor License Agreement.

@sbaker617 sbaker617 merged commit eab8588 into main Sep 4, 2025
141 of 202 checks passed
@sbaker617 sbaker617 deleted the henry-main branch September 4, 2025 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@timvaillancourt timvaillancourt Awaiting requested review from timvaillancourt

Assignees

No one assigned

Labels

cla:missing

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@HenryCaiHaiying @sbaker617 @harshit-gangal @shlomi-noach @chapsuk @dbussink @vitess-bot