Nick Tobey 9bc32d9db2 Merge pull request #6980 from dolthub/nicktobey/schemamerge ...

Correctly identify and report data conflicts when deleting rows and/or columns during a three-way merge.

2023-11-20 23:12:26 -08:00

..

bats

Merge pull request #6980 from dolthub/nicktobey/schemamerge

2023-11-20 23:12:26 -08:00

compatibility

Update bats tests. These tests test handling data conflicts, but the behavior that was in the test (row deletion + column deletion) is no longer a conflict. This commit changes the behavior to something else that is a conflict.

2023-11-15 14:36:19 -08:00

data-dump-loading-tests

fix failing bats tests

2023-10-18 12:12:23 -07:00

go-sql-server-driver

integration-tests/go-sql-server-driver: sql-server-cluster-users-and-grants.yaml: branch_control_block_on_write_replication: Add an assertion on a connection to server2 after the branch control perms replicate, to ensure we don't send the TERM signal to the server process at the end of the test before it is fully started up.

2023-11-10 15:03:50 -08:00

mysql-client-tests

Fix workbench tests

2023-10-17 10:48:37 -07:00

orm-tests

…

transactions

Bump gopkg.in/yaml.v3 in /integration-tests/transactions

2023-08-30 13:56:40 +00:00

DataDumpLoadDockerfile

[no-release-notes] integration-tests,SysbenchDockerfile: Bump to golang 1.21.2 in Dockerfiles.

2023-10-06 10:45:32 -07:00

MySQLDockerfile

[no-release-notes] integration-tests,SysbenchDockerfile: Bump to golang 1.21.2 in Dockerfiles.

2023-10-06 10:45:32 -07:00

MySQLDockerfile.dockerignore

…

ORMDockerfile

[no-release-notes] integration-tests,SysbenchDockerfile: Bump to golang 1.21.2 in Dockerfiles.

2023-10-06 10:45:32 -07:00