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-19.0: merge upstream v19.0.7 patch release #551

Merged
merged 98 commits into from
Nov 7, 2024

Conversation

timvaillancourt
Copy link
Member

@timvaillancourt timvaillancourt commented Nov 6, 2024

Description

This PR merges the upstream v19.0.7 patch release onto our slack-19.0 branch, which is currently based on v19.0.5

This PR is simply a git merge v19.0.7 of the tag and conflict resolutions. Also vitessio#16501 was reverted due to causing problems with our downgrade testing of slack-15.0

Related Issue(s)

https://github.com/vitessio/vitess/releases/tag/v19.0.7

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 30 commits May 8, 2024 16:26
…ssio#15906)

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

Signed-off-by: notfelineit <[email protected]>
Signed-off-by: <>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Frances Thai <[email protected]>
…n Mac (vitessio#15835) (vitessio#15915)

Signed-off-by: bddicken <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
…f add join predicate on rewrite (vitessio#15956) (vitessio#15960)

Signed-off-by: Harshit Gangal <[email protected]>
Signed-off-by: Andres Taylor <[email protected]>
Co-authored-by: Harshit Gangal <[email protected]>
Co-authored-by: Andres Taylor <[email protected]>
…n the bind variables map (vitessio#15961) (vitessio#15967)

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]>
…) (vitessio#16003)

Signed-off-by: Vicent Marti <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
…#16019) (vitessio#16027)

Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Signed-off-by: Florent Poinsard <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Signed-off-by: GitHub <[email protected]>
Signed-off-by: Florent Poinsard <[email protected]>
Co-authored-by: frouioui <[email protected]>
Co-authored-by: Florent Poinsard <[email protected]>
Signed-off-by: Florent Poinsard <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Signed-off-by: Frances Thai <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
…ssio#16132)

Co-authored-by: Harshit Gangal <[email protected]>
Co-authored-by: Andres Taylor <[email protected]>
Co-authored-by: Florent Poinsard <[email protected]>
…ght_string` results correctly. (vitessio#16129) (vitessio#16157)

Signed-off-by: Arthur Schreiber <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Arthur Schreiber <[email protected]>
…in self referencing FK (vitessio#16205) (vitessio#16207)

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

Signed-off-by: Rohit Nayak <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
…ting workflow streams in the copy phase (vitessio#16217) (vitessio#16222)

Signed-off-by: Rohit Nayak <[email protected]>
Co-authored-by: Rohit Nayak <[email protected]>
…Rules commands don't work (vitessio#16096) (vitessio#16124)

Signed-off-by: Rohit Nayak <[email protected]>
Co-authored-by: Rohit Nayak <[email protected]>
…tessio#16263) (vitessio#16267)

Signed-off-by: Andres Taylor <[email protected]>
Signed-off-by: Florent Poinsard <[email protected]>
Signed-off-by: Florent Poinsard <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Florent Poinsard <[email protected]>
Co-authored-by: Andres Taylor <[email protected]>
…te` image for the MySQL container (vitessio#16282) (vitessio#16285)

Signed-off-by: Florent Poinsard <[email protected]>
Co-authored-by: Florent Poinsard <[email protected]>
… (vitessio#16332)

Signed-off-by: Matt Lord <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Matt Lord <[email protected]>
vitess-bot bot and others added 9 commits October 23, 2024 13:02
…s. (vitessio#16975) (vitessio#17039)

Signed-off-by: Arthur Schreiber <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
…e-Route Queries (vitessio#17077) (vitessio#17085)

Signed-off-by: Harshit Gangal <[email protected]>
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]>
Co-authored-by: Harshit Gangal <[email protected]>
…io#17066) (vitessio#17089)

Signed-off-by: Shlomi Noach <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Shlomi Noach <[email protected]>
…17062) (vitessio#17110)

Signed-off-by: Florent Poinsard <[email protected]>
Signed-off-by: Florent Poinsard <[email protected]>
Co-authored-by: Florent Poinsard <[email protected]>
Co-authored-by: Matt Lord <[email protected]>
Co-authored-by: Florent Poinsard <[email protected]>
Signed-off-by: Rohit Nayak <[email protected]>
Co-authored-by: Rohit Nayak <[email protected]>
Signed-off-by: Rohit Nayak <[email protected]>
Co-authored-by: Rohit Nayak <[email protected]>
Copy link

salesforce-cla bot commented Nov 6, 2024

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

@github-actions github-actions bot added this to the v19.0.5 milestone Nov 6, 2024
@timvaillancourt timvaillancourt changed the title slack-19.0: merge upstream v19.0.7 patch release slack-19.0: merge upstream v19.0.7 patch release Nov 6, 2024
…low by using same test code version as binary (vitessio#16494) (vitessio#16501)"

This reverts commit 25a80ac.
@timvaillancourt
Copy link
Member Author

timvaillancourt commented Nov 7, 2024

Failure:

=== RUN   TestAliasesInOuterJoinQueries
    misc_test.go:344: 
        	Error Trace:	/Users/tvaillancourt/github/vitess/go/test/endtoend/utils/cmp.go:201
        	            				/Users/tvaillancourt/github/vitess/go/test/endtoend/vtgate/queries/misc/misc_test.go:344
        	Error:      	Received unexpected error:
        	            	target: ks_misc.-80.primary: vttablet: rpc error: code = AlreadyExists desc = Duplicate entry '1' for key 'tbl.PRIMARY' (errno 1062) (sqlstate 23000) (CallerID: userData1): Sql: "insert into tbl(id, unq_col, nonunq_col) values (:_id_0, :vtg2 /* INT64 */, :vtg3 /* INT64 */),(:_id_1, :vtg5 /* INT64 */, :vtg6 /* INT64 */),(:_id_2, :vtg8 /* INT64 */, :vtg9 /* INT64 */)", BindVars: {_id_0: "type:INT64 value:\"1\""_id_1: "type:INT64 value:\"2\""_id_2: "type:INT64 value:\"3\""vtg2: "type:INT64 value:\"2\""vtg3: "type:INT64 value:\"3\""vtg5: "type:INT64 value:\"5\""vtg6: "type:INT64 value:\"3\""vtg8: "type:INT64 value:\"42\""vtg9: "type:INT64 value:\"2\""} (errno 1062) (sqlstate 23000) during query: insert into tbl(id, unq_col, nonunq_col) values (1,2,3), (2,5,3), (3, 42, 2)
        	Test:       	TestAliasesInOuterJoinQueries
        	Messages:   	[Vitess Error] for query: insert into tbl(id, unq_col, nonunq_col) values (1,2,3), (2,5,3), (3, 42, 2)
--- FAIL: TestAliasesInOuterJoinQueries (0.01s)

EDIT: fixed bad merge conflict ✅

Signed-off-by: Tim Vaillancourt <[email protected]>
@timvaillancourt timvaillancourt marked this pull request as ready for review November 7, 2024 16:29
@timvaillancourt timvaillancourt requested a review from a team as a code owner November 7, 2024 16:29
@timvaillancourt timvaillancourt merged commit 4e3f068 into slack-19.0 Nov 7, 2024
161 of 162 checks passed
@timvaillancourt timvaillancourt deleted the v19.0.7.slack-19.0 branch November 7, 2024 17:51
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.

9 participants