Skip to content

Conversation

@grendello
Copy link
Contributor

@grendello grendello requested a review from jonpryor as a code owner January 5, 2021 10:39
@jonpryor
Copy link
Contributor

jonpryor commented Jan 7, 2021

While you were away, the default branch for xamarin/sqlite was changed from master to main:

main was updated on December 15 and used to create the https://github.com/xamarin/sqlite/tree/3.32.2 branch.

(I would have done 3.34 at the time, but Google's SQLite patch didn't apply to 3.34 at the time, so…)

@grendello: Would it be possible to update things to use sqlite/main instead of sqlite/master?

Copy link
Contributor

@jonpryor jonpryor left a comment

Choose a reason for hiding this comment

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

@grendello
Copy link
Contributor Author

@jonpryor the upstream patch still doesn't apply, I fixed it by hand :)

@grendello
Copy link
Contributor Author

@jonpryor I removed the "master" based branch and replaced with one rebased on "main" - it DID rewrite history for xamarin/sqlite though (shouldn't be a problem since it's only us who access it and the 3.34.0 branch was referenced just by this PR)

@jonpryor
Copy link
Contributor

jonpryor commented Jan 7, 2021

@grendello wrote:

I fixed it by hand

You are a braver man than I.

@grendello
Copy link
Contributor Author

@grendello wrote:

I fixed it by hand

You are a braver man than I.

It was only a very small fragment, offset by a couple hundred lines

@jonpryor jonpryor merged commit 0f2dc44 into dotnet:master Jan 7, 2021
@grendello grendello deleted the sqlite-3.34.0 branch January 7, 2021 21:03
grendello added a commit to grendello/xamarin-android that referenced this pull request Jan 25, 2021
Context: https://sqlite.org/releaselog/3_34_1.html
Changes: https://github.com/xamarin/sqlite/compare/3.34.0..3.34.1

The most important upstream change is:

  * Fix a potential use-after-free bug when processing a a subquery with
    both a correlated WHERE clause and a "HAVING 0" clause and where the
    parent query is an aggregate.
@github-actions github-actions bot locked and limited conversation to collaborators Jan 26, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants