Merge pull request #6318 from planetscale/ds-6.0-backport-6205

backport #6205 to 6.0 release branch

go/vt/vtgate/executor.go

@@ -1077,6 +1077,11 @@ func (e *Executor) StreamExecute(ctx context.Context, method string, safeSession
 		return err
 	}
 
+	err = e.addNeededBindVars(plan.BindVarNeeds, bindVars, safeSession)
+	if err != nil {
+		return err
+	}
+
 	execStart := time.Now()
 	logStats.PlanTime = execStart.Sub(logStats.StartTime)
 

go/vt/vtgate/executor_test.go

@@ -2312,3 +2312,21 @@ func TestGenerateCharsetRows(t *testing.T) {
 		})
 	}
 }
+
+func TestOlapSelectDatabase(t *testing.T) {
+	executor, _, _, _ := createExecutorEnv()
+	executor.normalize = true
+
+	session := &vtgatepb.Session{Autocommit: true}
+
+	sql := `select database()`
+	target := querypb.Target{}
+	cbInvoked := false
+	cb := func(r *sqltypes.Result) error {
+		cbInvoked = true
+		return nil
+	}
+	err := executor.StreamExecute(context.Background(), "TestExecute", NewSafeSession(session), sql, nil, target, cb)
+	assert.NoError(t, err)
+	assert.True(t, cbInvoked)
+}