conflicts

James Cor · James Cor · commit 301e26af7470 · 2024-10-10T14:37:47.000-07:00
diff --git a/enginetest/queries/script_queries.go b/enginetest/queries/script_queries.go
@@ -7494,7 +7494,7 @@ where
 				},
 			},
 			{
-				Query: "alter table t modify column e enum('abc');",
+				Query:          "alter table t modify column e enum('abc');",
 				ExpectedErrStr: "value 2 is not valid for this Enum",
 			},
 		},

Original file line number	Diff line number	Diff line change
`@@ -7494,7 +7494,7 @@ where`
`7494`	`7494`	`},`
`7495`	`7495`	`},`
`7496`	`7496`	`{`
`7497`		`- Query: "alter table t modify column e enum('abc');",`
	`7497`	`+ Query: "alter table t modify column e enum('abc');",`
`7498`	`7498`	`ExpectedErrStr: "value 2 is not valid for this Enum",`
`7499`	`7499`	`},`
`7500`	`7500`	`},`