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-dsdefense: backport vitessio/vitess#14428 from v16 (#165) #167

Conversation

timvaillancourt
Copy link
Member

Description

This PR backports the upstream PR vitessio#14426 to slack-vitess-r14.0.5-dsdefense using an earlier backport to slack-vitess-r14.0.5

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)
  3. slack-vitess-r14.0.5: backport vitessio/vitess#14428 from v16 #165 (Slack v14 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

* 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]>
Copy link

@tanjinx tanjinx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just compared side by side, LGTM, thanks Tim!

Signed-off-by: Tim Vaillancourt <[email protected]>
Signed-off-by: Tim Vaillancourt <[email protected]>
@timvaillancourt timvaillancourt merged commit 0b488db into slack-vitess-r14.0.5-dsdefense Nov 13, 2023
241 checks passed
@timvaillancourt timvaillancourt deleted the pr-14426-slack-vitess-r14.0.5-dsdefense branch November 13, 2023 21:17
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.

2 participants