Merge pull request #6555 from planetscale/7.0-bp-6514

backport #6514 to 7.0 release branch

go/vt/vttablet/endtoend/main_test.go

@@ -215,6 +215,13 @@ var tableACLConfig = `{
  "writers": ["dev"],
  "admins": ["dev"]
  },
+ {
+ "name": "vitess_test_ddl",
+ "table_names_or_prefixes": ["vitess_test_ddl"],
+ "readers": ["dev"],
+ "writers": ["dev"],
+ "admins": ["dev"]
+ },
  {
  "name": "vitess_seq",
  "table_names_or_prefixes": ["vitess_seq"],

go/vt/vttablet/endtoend/reserve_test.go

@@ -799,6 +799,58 @@ func TestReserveExecuteWithExecuteFailureAndCheckConnectionAndDBState(t *testing
  require.Error(t, client.Release())
 }
 
+func TestReserveExecuteDDLWithoutTx(t *testing.T) {
+ client := framework.NewClient()
+ defer client.Release()
+
+ connQuery := "select connection_id()"
+ createQuery := "create table vitess_test_ddl(id bigint primary key)"
+ dropQuery := "drop table vitess_test_ddl"
+ descQuery := "describe vitess_test_ddl"
+
+ qr1, err := client.ReserveExecute(connQuery, nil, nil)
+ require.NoError(t, err)
+
+ _, err = client.Execute(createQuery, nil)
+ require.NoError(t, err)
+ require.Zero(t, client.TransactionID())
+ defer client.Execute(dropQuery, nil)
+
+ qr2, err := client.Execute(connQuery, nil)
+ require.NoError(t, err)
+ assert.Equal(t, qr1.Rows, qr2.Rows)
+
+ qr3, err := client.Execute(descQuery, nil)
+ require.NoError(t, err)
+ require.NotZero(t, qr3.Rows)
+}
+
+func TestReserveExecuteDDLWithTx(t *testing.T) {
+ client := framework.NewClient()
+ defer client.Release()
+
+ connQuery := "select connection_id()"
+ createQuery := "create table vitess_test_ddl(id bigint primary key)"
+ dropQuery := "drop table vitess_test_ddl"
+ descQuery := "describe vitess_test_ddl"
+
+ qr1, err := client.ReserveBeginExecute(connQuery, nil, nil)
+ require.NoError(t, err)
+
+ _, err = client.Execute(createQuery, nil)
+ require.NoError(t, err)
+ require.NotZero(t, client.TransactionID())
+ defer client.Execute(dropQuery, nil)
+
+ qr2, err := client.Execute(connQuery, nil)
+ require.NoError(t, err)
+ assert.Equal(t, qr1.Rows, qr2.Rows)
+
+ qr3, err := client.Execute(descQuery, nil)
+ require.NoError(t, err)
+ require.NotZero(t, qr3.Rows)
+}
+
 func killConnection(t *testing.T, connID string) {
  client := framework.NewClient()
  _, err := client.ReserveExecute("select 1", []string{fmt.Sprintf("kill %s", connID)}, nil)

go/vt/vttablet/tabletserver/query_executor.go

@@ -376,9 +376,13 @@ func (qre *QueryExecutor) execDDL(conn *StatefulConnection) (*sqltypes.Result, e
  if err != nil {
  return nil, err
  }
- err = qre.BeginAgain(qre.ctx, conn)
- if err != nil {
- return nil, err
+ // Only perform this operation when the connection has transaction open.
+ // TODO: This actually does not retain the old transaction. We should see how to provide correct behaviour to client.
+ if conn.txProps != nil {
+ err = qre.BeginAgain(qre.ctx, conn)
+ if err != nil {
+ return nil, err
+ }
  }
  return result, nil
 }