Merge branch 'main' into james/proc

Author: James Cor

enginetest/queries/queries.go

@@ -10133,6 +10133,13 @@ from typestable`,
 			{2},
 		},
 	},
+
+	{
+		Query: "select @@sql_mode = 1",
+		Expected: []sql.Row{
+			{false},
+		},
+	},
 }
 
 var KeylessQueries = []QueryTest{

sql/analyzer/rule_ids.go

@@ -9,7 +9,7 @@ const (
 	applyDefaultSelectLimitId     RuleId = iota // applyDefaultSelectLimit
 	validateOffsetAndLimitId                    // validateOffsetAndLimit
 	validateStarExpressionsId                   // validateStarExpressions
-	validateCreateTableId                       // validateCreateTable
+	ValidateCreateTableId                       // validateCreateTable
 	validateAlterTableId                        // validateAlterTable
 	validateExprSemId                           // validateExprSem
 	loadStoredProceduresId                      // loadStoredProcedures

sql/analyzer/ruleid_string.go

@@ -34,7 +34,7 @@ var OnceBeforeDefault = []Rule{
 	{applyDefaultSelectLimitId, applyDefaultSelectLimit},
 	{replaceCountStarId, replaceCountStar},
 	{validateOffsetAndLimitId, validateOffsetAndLimit},
-	{validateCreateTableId, validateCreateTable},
+	{ValidateCreateTableId, validateCreateTable},
 	{validateAlterTableId, validateAlterTable},
 	{validateExprSemId, validateExprSem},
 	{resolveDropConstraintId, resolveDropConstraint},

sql/analyzer/rules.go

@@ -168,11 +168,8 @@ func (c *comparison) Compare(ctx *sql.Context, row sql.Row) (int, error) {
 			return 0, err
 		}
 	}
-	if types.IsTextOnly(compareType) {
+	if _, isSet := compareType.(sql.SetType); !isSet && types.IsTextOnly(compareType) {
 		collationPreference, _ = c.CollationCoercibility(ctx)
-		if err != nil {
-			return 0, err
-		}
 		stringCompareType := compareType.(sql.StringType)
 		compareType = types.MustCreateString(stringCompareType.Type(), stringCompareType.Length(), collationPreference)
 	}