tests

Author: James Cor

enginetest/queries/transaction_queries.go

@@ -1064,4 +1064,56 @@ var TransactionTests = []TransactionTest{
 			},
 		},
 	},
+	{
+		Name: "ddl queries are implicitly committed",
+		Assertions: []ScriptTestAssertion{
+			{
+				Query:    "/* client a */ set @@autocommit = 0;",
+				Expected: []sql.Row{{}},
+			},
+			{
+				Query:    "/* client a */ start transaction;",
+				Expected: []sql.Row{},
+			},
+			{
+				// This implicitly commits the transaction
+				Query:    "/* client a */ create table t (pk int primary key);",
+				Expected: []sql.Row{{types.OkResult{}}},
+			},
+			{
+				Query:    "/* client a */ commit;",
+				Expected: []sql.Row{},
+			},
+			{
+				Query:    "/* client b */ select * from t;",
+				Expected: []sql.Row{},
+			},
+
+			{
+				Query:    "/* client a */ start transaction;",
+				Expected: []sql.Row{},
+			},
+			{
+				Query:    "/* client a */ insert into t values (1), (2), (3);",
+				Expected: []sql.Row{{types.OkResult{RowsAffected: 3}}},
+			},
+			{
+				Query:    "/* client b */ select * from t;",
+				Expected: []sql.Row{},
+			},
+			{
+				// This implicitly commits the transaction
+				Query:    "/* client a */ create table t2 (pk int primary key);",
+				Expected: []sql.Row{{types.OkResult{}}},
+			},
+			{
+				Query:    "/* client b */ select * from t;",
+				Expected: []sql.Row{
+					{1},
+					{2},
+					{3},
+				},
+			},
+		},
+	},
 }

sql/rowexec/transaction_iters.go

@@ -84,12 +84,15 @@ func AddTransactionCommittingIter(ctx *sql.Context, qFlags *sql.QueryFlags, iter
 	// TODO: In the future we should ensure that analyzer supports implicit commits instead of directly
 	// accessing autocommit here.
 	// cc. https://dev.mysql.com/doc/refman/8.0/en/implicit-commit.html
-	autocommit, err := plan.IsSessionAutocommit(ctx)
+	shouldCommit, err := plan.IsSessionAutocommit(ctx)
 	if err != nil {
 		return nil, err
 	}
 
-	shouldCommit := autocommit || (qFlags != nil && qFlags.IsSet(sql.QFlagDDL))
+	if qFlags != nil && qFlags.IsSet(sql.QFlagDDL) {
+		shouldCommit = true
+		ctx.SetIgnoreAutoCommit(false)
+	}
 	return &TransactionCommittingIter{childIter: iter, shouldCommit: shouldCommit}, nil
 }