Fix for issue #5390

Author: Hydrocharged

enginetest/queries/procedure_queries.go

@@ -268,6 +268,56 @@ END;`,
 			},
 		},
 	},
+	{
+		Name: "REPEAT loop over user variable",
+		SetUpScript: []string{
+			`CREATE PROCEDURE p1(p1 INT)
+BEGIN
+	SET @x = 0;
+	REPEAT SET @x = @x + 1; UNTIL @x > p1 END REPEAT;
+END`,
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query:    "CALL p1(0)",
+				Expected: []sql.Row{},
+			},
+			{
+				Query:    "CALL p1(1)",
+				Expected: []sql.Row{{}, {}}, // Next calls return an empty row, but progress the loop
+			},
+			{
+				Query:    "CALL p1(2)",
+				Expected: []sql.Row{{}, {}, {}},
+			},
+		},
+	},
+	{
+		Name: "WHILE loop over user variable",
+		SetUpScript: []string{
+			`CREATE PROCEDURE p1(p1 INT)
+BEGIN
+	SET @x = 0;
+	WHILE @x <= p1 DO
+		SET @x = @x + 1;
+	END WHILE;
+END`,
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query:    "CALL p1(0)",
+				Expected: []sql.Row{{}},
+			},
+			{
+				Query:    "CALL p1(1)",
+				Expected: []sql.Row{{}, {}},
+			},
+			{
+				Query:    "CALL p1(2)",
+				Expected: []sql.Row{{}, {}, {}},
+			},
+		},
+	},
 	{
 		Name: "CASE statements",
 		SetUpScript: []string{

sql/analyzer/stored_procedures.go

@@ -130,7 +130,15 @@ func analyzeProcedureBodies(ctx *sql.Context, a *Analyzer, node sql.Node, skipCa
 		var newChild sql.Node
 		switch child := child.(type) {
 		case plan.RepresentsBlock:
+			// Many analyzer rules only check the top-level node, so we have to recursively analyze each child
 			newChild, _, err = analyzeProcedureBodies(ctx, a, child, skipCall, scope, sel)
+			if err != nil {
+				return nil, transform.SameTree, err
+			}
+			// Blocks may have expressions declared directly on them, so we explicitly check the block node for variables
+			newChild, _, err = a.analyzeWithSelector(ctx, newChild, scope, SelectAllBatches, func(id RuleId) bool {
+				return id == resolveVariablesId
+			})
 		case *plan.Call:
 			if skipCall {
 				newChild = child

sql/types/typecheck.go

@@ -32,6 +32,9 @@ func IsBlobType(t sql.Type) bool {
 
 // IsBinaryType checks if t is BINARY, VARBINARY, or BLOB
 func IsBinaryType(t sql.Type) bool {
+	if t == nil {
+		return false
+	}
 	switch t.Type() {
 	case sqltypes.Binary, sqltypes.VarBinary, sqltypes.Blob:
 		return true