fix and test

Author: James Cor

enginetest/queries/script_queries.go

@@ -7531,6 +7531,23 @@ where
 			},
 		},
 	},
+	{
+		Name: "multi enum return types",
+		SetUpScript: []string{
+			"create table t (i int primary key, e enum('abc', 'def', 'ghi'));",
+			"insert into t values (1, 'abc'), (2, 'def'), (3, 'ghi');",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query: "select i, (case e when 'abc' then e when 'def' then e when 'ghi' then e end) as e from t;",
+				Expected: []sql.Row{
+					{1, "abc"},
+					{2, "def"},
+					{3, "ghi"},
+				},
+			},
+		},
+	},
 }
 
 var SpatialScriptTests = []ScriptTest{

sql/expression/case.go

@@ -52,6 +52,12 @@ func combinedCaseBranchType(left, right sql.Type) sql.Type {
 	if right == types.Null {
 		return left
 	}
+	if types.IsEnum(left) && types.IsEnum(right) {
+		return right
+	}
+	if types.IsSet(left) && types.IsSet(right) {
+		return right
+	}
 	if types.IsTextOnly(left) && types.IsTextOnly(right) {
 		return types.LongText
 	}