Skip to content

Commit af82daa

Browse files
authored
Merge pull request #896 from dolthub/james/qflags
[no-release-notes] manual bump
2 parents b7129fe + 1eba519 commit af82daa

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20240827111219-e4bb9ca3442d
1313
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
1414
github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662
15-
github.com/dolthub/go-mysql-server v0.18.2-0.20241028173746-a6973b5e90d6
15+
github.com/dolthub/go-mysql-server v0.18.2-0.20241028201017-2c6e3dd1d10b
1616
github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216
1717
github.com/dolthub/vitess v0.0.0-20241016191424-d14e107a654e
1818
github.com/fatih/color v1.13.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
224224
github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
225225
github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662 h1:aC17hZD6iwzBwwfO5M+3oBT5E5gGRiQPdn+vzpDXqIA=
226226
github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168=
227-
github.com/dolthub/go-mysql-server v0.18.2-0.20241028173746-a6973b5e90d6 h1:+RYghO025hK+Q2y9rPXv3mLOSnWOKllVjfg3vEJ4lfM=
228-
github.com/dolthub/go-mysql-server v0.18.2-0.20241028173746-a6973b5e90d6/go.mod h1:z/GGuH2asedC+lkJA4sx+C3oyRH1HRx8ET6N9AGBVms=
227+
github.com/dolthub/go-mysql-server v0.18.2-0.20241028201017-2c6e3dd1d10b h1:3qUuxazPaUkIx8uEW44ZEifCiH3aFodLw7KeTpl3zqI=
228+
github.com/dolthub/go-mysql-server v0.18.2-0.20241028201017-2c6e3dd1d10b/go.mod h1:z/GGuH2asedC+lkJA4sx+C3oyRH1HRx8ET6N9AGBVms=
229229
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=
230230
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q=
231231
github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE=

server/doltgres_handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ func (h *DoltgresHandler) executeQuery(ctx *sql.Context, query string, parsed sq
286286
// executeBoundPlan is a QueryExecutor that calls QueryWithBindings on the given engine using the given query and parsed
287287
// statement, which may be nil.
288288
func (h *DoltgresHandler) executeBoundPlan(ctx *sql.Context, query string, _ sqlparser.Statement, plan sql.Node) (sql.Schema, sql.RowIter, *sql.QueryFlags, error) {
289-
return h.e.PrepQueryPlanForExecution(ctx, query, plan)
289+
return h.e.PrepQueryPlanForExecution(ctx, query, plan, nil)
290290
}
291291

292292
// maybeReleaseAllLocks makes a best effort attempt to release all locks on the given connection. If the attempt fails,

0 commit comments

Comments
 (0)