Merged PRs
dolt
- 10705: bug fix: don't error on ignored tables when continuing a rebase
When continuing an active rebase, Dolt checks to make sure that the branch being rebased hasn't had other changes applied before it update that branch pointer to the new rebased commits. This logic wasn't taking account of ignored tables before, which preventing users from being able to complete an interactive rebase.
Fixes: #10698 - 10704: Set timezone in Doltgres CI tests
- 10703: go: store/nbs,doltdb: When Clone into a destination database, disable Conjoin running as part of landing files into the destination.
When we land files into a destination database as part of a Clone, by default we used to be able to trigger a conjoin on the destination database. After the change in #10652, we now also block on any of those conjoin operations completing as we closed the DestDB that was created as part of a backup sync/sync-url operation.
In the case of backup, this conjoin behavior is a little contrary to what we are trying to accomplish.
This PR changes it so that we dynamically disable conjoin on the destination while we clone into it. After the clone is finished, we reenable conjoin. At that point, if the database is used as an actual database, conjoin will kick in as expected. But if it is immediately closed, the destination files stay as they were. - 10681: bug fix: binlog schema change replication to a MySQL replica
Fixes bugs with schema changes when binary logging is enabled, such as changing a column's type (e.g.VARCHARtoTEXT), adding and dropping columns. Existing type serialization logic that converts diff data into binlog messages was split into two separate phases: deserializing the data from the Dolt tuple store (using the original schema) and serializing the data into the MySQL binlog protocol (using the target schema). - 10665: cache node hash
go-mysql-server
- 3468: Separate update expressions into explicit and derived update expressions
fixes #10657
Update expressions are separated into explicit and derived. Derived update expressions are only evaluated if the explicit update expressions actually made any changes to the row.
Also removes some dead code and includes some minor fixes/refactors