Skip to content
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.

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

slack-vitess-r14.0.5: backport vitessio/vitess#14428 from v16 #165

Merged
merged 7 commits into from
Nov 9, 2023

Conversation

timvaillancourt
Copy link
Member

@timvaillancourt timvaillancourt commented Nov 7, 2023

Description

This PR backports the upstream PR vitessio#14426 using the v16 backport of this change, as that is the closest release to v14

Related Issue(s)

  1. Make column resolution closer to MySQL vitessio/vitess#14426 (original PR)
  2. [release-16.0] Make column resolution closer to MySQL (#14426) vitessio/vitess#14428 (v16 backport)

Checklist

  • "Backport to:" labels have been added if this change should be back-ported
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on the CI
  • Documentation was added or is not required

Deployment Notes

systay and others added 2 commits November 7, 2023 20:43
Copy link

salesforce-cla bot commented Nov 7, 2023

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

@timvaillancourt timvaillancourt changed the title slack-vitess-r14.0.5: backport vitessio/vitess#14428 slack-vitess-r14.0.5: backport vitessio/vitess#14428 from v16 Nov 7, 2023
Signed-off-by: Tim Vaillancourt <[email protected]>
Signed-off-by: Tim Vaillancourt <[email protected]>
Signed-off-by: Tim Vaillancourt <[email protected]>
@timvaillancourt timvaillancourt marked this pull request as ready for review November 8, 2023 23:46
@timvaillancourt timvaillancourt requested a review from a team as a code owner November 8, 2023 23:46
@timvaillancourt timvaillancourt merged commit 58b2ed2 into slack-vitess-r14.0.5 Nov 9, 2023
240 checks passed
@timvaillancourt timvaillancourt deleted the pr-14426-slack-vitess-r14.0.5 branch November 9, 2023 18:04
timvaillancourt added a commit that referenced this pull request Nov 12, 2023
* make column resolution closer to mysql

Signed-off-by: Andres Taylor <[email protected]>

* Fix bad merge conflict fix

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

* Possible horizon_planning.go fix

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

* Fix aggr_cases.json plan

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

* Fix group by order

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

* Remove 'TablesUsed', not in v14

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

---------

Signed-off-by: Andres Taylor <[email protected]>
Signed-off-by: Tim Vaillancourt <[email protected]>
Co-authored-by: Andres Taylor <[email protected]>
timvaillancourt added a commit that referenced this pull request Nov 13, 2023
) (#167)

* `slack-vitess-r14.0.5`: backport vitessio#14428 from v16 (#165)

* make column resolution closer to mysql

Signed-off-by: Andres Taylor <[email protected]>

* Fix bad merge conflict fix

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

* Possible horizon_planning.go fix

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

* Fix aggr_cases.json plan

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

* Fix group by order

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

* Remove 'TablesUsed', not in v14

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

---------

Signed-off-by: Andres Taylor <[email protected]>
Signed-off-by: Tim Vaillancourt <[email protected]>
Co-authored-by: Andres Taylor <[email protected]>

* Update e2e vttablet.txt

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

* Update e2e vtgate.txt

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

---------

Signed-off-by: Andres Taylor <[email protected]>
Signed-off-by: Tim Vaillancourt <[email protected]>
Co-authored-by: Andres Taylor <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants