Skip to content

Commit 86903b3

Browse files
committed
chore: fix conflicts
1 parent c720668 commit 86903b3

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

engine_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ import (
2222
"github.com/dolthub/vitess/go/vt/proto/query"
2323
"github.com/stretchr/testify/require"
2424

25-
"github.com/dolthub/go-mysql-server/memory"
26-
"github.com/dolthub/go-mysql-server/sql"
27-
"github.com/dolthub/go-mysql-server/sql/analyzer"
28-
"github.com/dolthub/go-mysql-server/sql/expression"
29-
"github.com/dolthub/go-mysql-server/sql/plan"
30-
"github.com/dolthub/go-mysql-server/sql/rowexec"
31-
"github.com/dolthub/go-mysql-server/sql/types"
32-
"github.com/dolthub/go-mysql-server/sql/variables"
25+
"github.com/gabereiser/go-mysql-server/memory"
26+
"github.com/gabereiser/go-mysql-server/sql"
27+
"github.com/gabereiser/go-mysql-server/sql/analyzer"
28+
"github.com/gabereiser/go-mysql-server/sql/expression"
29+
"github.com/gabereiser/go-mysql-server/sql/plan"
30+
"github.com/gabereiser/go-mysql-server/sql/rowexec"
31+
"github.com/gabereiser/go-mysql-server/sql/types"
32+
"github.com/gabereiser/go-mysql-server/sql/variables"
3333
)
3434

3535
func TestBindingsToExprs(t *testing.T) {

sql/mysql_db/mysql_db.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import (
2929
flatbuffers "github.com/dolthub/flatbuffers/v23/go"
3030
"github.com/dolthub/vitess/go/mysql"
3131

32-
"github.com/dolthub/go-mysql-server/sql"
33-
"github.com/dolthub/go-mysql-server/sql/in_mem_table"
34-
"github.com/dolthub/go-mysql-server/sql/mysql_db/serial"
32+
"github.com/gabereiser/go-mysql-server/sql"
33+
"github.com/gabereiser/go-mysql-server/sql/in_mem_table"
34+
"github.com/gabereiser/go-mysql-server/sql/mysql_db/serial"
3535
)
3636

3737
// MySQLDbPersistence is used to determine the behavior of how certain tables in MySQLDb will be persisted.

0 commit comments

Comments
 (0)