Merged PRs

dolt

• 3850: fix session vars and add region
• 3838: Make unique key errors more consistent and fix unique key bats for new format
  Companion GMS PR: dolthub/go-mysql-server#1116
• 3833: Add jwks to server yaml config
• 3830: doltcore/merge: Disallow revert, cherry-pick for commits without parents
• 3827: Added table, index, and view caching for performance
• 3824: Moving LargeJsonObject tests from go-mysql-server into Dolt
  Moved LargeJsonObjects out of go-mysql-server (dolthub/go-mysql-server#1115) since they were causing go test -race to fail for Dolt. These tests are now executed from a new Dolt-specific enginetest that is skipped by default in CI environments, unless the DOLT_TEST_RUN_NON_RACE_TESTS env var is set (same process used to skip the TestLargeJsonObjects unit test in Dolt).
  I also added the -v flag to the dolthub/dolt enginetest race detection GH workflow so future failures have better output on exactly what failed.
  I ran these changes through go test -race enginetests on Ubuntu and confirmed it now passes.
• 3823: go/{commands,doltcore}: Rewrote Dolt docs to use SQL path
• 3821: doltcore/doltdb: Added interface for Rootish
• 3816: replicate delete branch
  Replicate will push deletes on write in syncronous and async mode. Read replicas will delete refs that don't exist on the replica. Both of these can have destructive effects if not used carefully.
• 3802: go/libraries/doltcore/sqle: read_replica_database.go: Fix race condition when we replicate the same head on more than one session.
  Previously StartTransaction would pull the new head from the upstream on each
  StartTransaction, but there was no concurrency control to ensure that pulls
  that started earlier didn't attempt to overwrite pulls that started later. The
  end result was that some transactions would fail spuriously because the old
  commit was not a fast forward merge of the current commit.
  This adds a concurrency limiter so that only one pull per branch is outstanding
  at a time.
• 3744: Revamp the Import Benchmarker
  This pr refactors the import benchmarker and enables users to leverage Golang's built-in benchmarking suite against dolt table import.
• 3732: Rework File Handling for privileges
  Fix for: #3711
  Changes:
  • --multi-dir-db flag is now --data-dir
  • adds a .doltcfg directory
  • adds a --doltcfg-dir flag option
  • default location is $data-dir/.doltcfg
  • default value for --privilege-file will be $doltcfg/privileges.db

go-mysql-server

• 1115: pulling out large JSON test scripts
  The large JSON test scripts have been causing go test -race to fail for Dolt (on ubuntu at least). This PR removes them from go-mysql-server and PR #3824 moves them into Dolt.
  Confirmed that go test -race for Dolt's enginetests passes again on Ubuntu after this change.
• 1105: Performance improvements in permission checking and view resolution
• 1102: remove ValidateCanPersist()
  removes the ValidateCanPersist() from Persister interface, as it is no longer used.
  Companion PR: #3732
• 1101: Bump ruby-mysql from 2.9.14 to 2.10.0 in /_integration/ruby
  Bumps ruby-mysql from 2.9.14 to 2.10.0.
  Commits

  • 631384e version 2.10.0
  • 4124bec support OPT_LOAD_DATA_LOCAL_DIR
  • 5b47f75 update constants and client error from 8.0
  • 44520a1 Merge pull request #28 from duerst/master
  • 20ace1b Update charset.rb
  • b2e2ac4 version 2.9.14
  • 6cf6ee1 support JSON type on MySQL 5.7
  • 98a0954 test for MySQL 5.7
  • ed7063a add collations and constants from MySQL 5.7.10
  • See full diff in compare view
  
  [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
  Dependabot commands and options

  
  You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/dolthub/go-mysql-server/network/alerts).

Closed Issues

• 3834: Show Variables Where Is An Unsupported Feature
• 3711: Rework file handling for users/privileges