Skip to content

Commit 486f6d5

Browse files
author
James Cor
committed
Merge branch 'james/lazy' of https://github.com/dolthub/go-mysql-server into james/lazy
2 parents 5a79bc7 + b5c1e81 commit 486f6d5

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

enginetest/engine_only_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"context"
1919
sql2 "database/sql"
2020
"fmt"
21-
"github.com/dolthub/go-mysql-server/sql/variables"
2221
"io"
2322
"net"
2423
"runtime"
@@ -47,6 +46,7 @@ import (
4746
"github.com/dolthub/go-mysql-server/sql/planbuilder"
4847
"github.com/dolthub/go-mysql-server/sql/rowexec"
4948
"github.com/dolthub/go-mysql-server/sql/types"
49+
"github.com/dolthub/go-mysql-server/sql/variables"
5050
)
5151

5252
// This file is for tests of the engine that we are very sure do not rely on a particular database implementation. They

server/handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"context"
1919
"encoding/base64"
2020
"fmt"
21-
"github.com/dolthub/go-mysql-server/sql/expression"
2221
"io"
2322
"net"
2423
"regexp"
@@ -41,6 +40,7 @@ import (
4140
"github.com/dolthub/go-mysql-server/internal/sockstate"
4241
"github.com/dolthub/go-mysql-server/sql"
4342
"github.com/dolthub/go-mysql-server/sql/analyzer"
43+
"github.com/dolthub/go-mysql-server/sql/expression"
4444
"github.com/dolthub/go-mysql-server/sql/iters"
4545
"github.com/dolthub/go-mysql-server/sql/plan"
4646
"github.com/dolthub/go-mysql-server/sql/rowexec"

sql/types/time.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ func appendDigit(v int64, extend int, buf []byte, i int) int {
500500
cmp *= 10
501501
}
502502

503-
for cmp > 0 && v < cmp{
503+
for cmp > 0 && v < cmp {
504504

505505
buf[i] = '0'
506506
i++

0 commit comments

Comments
 (0)