planner, executor: let 'show [variables|status]' be sorted by… (pingc…

…ap#14727)
m4ver1k · Feb 14, 2020 · e5bffd9 · e5bffd9
1 parent 8c804f4
commit e5bffd9
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/executor/seqtest/seq_executor_test.go b/executor/seqtest/seq_executor_test.go
@@ -598,6 +598,21 @@ func (s *seqTestSuite) TestShow(c *C) {
 		"c8|datetime|YES||CURRENT_TIMESTAMP|DEFAULT_GENERATED on update CURRENT_TIMESTAMP",
 		"c9|year(4)|YES||2014|",
 	))
+
+	// Test if 'show [status|variables]' is sorted by Variable_name (#14542)
+	sqls := []string{
+		"show global status;",
+		"show session status;",
+		"show global variables",
+		"show session variables"}
+
+	for _, sql := range sqls {
+		res := tk.MustQuery(sql)
+		c.Assert(res, NotNil)
+		sorted := tk.MustQuery(sql).Sort()
+		c.Assert(sorted, NotNil)
+		c.Check(res, DeepEquals, sorted)
+	}
 }
 
 func (s *seqTestSuite) TestShowStatsHealthy(c *C) {

diff --git a/planner/core/planbuilder.go b/planner/core/planbuilder.go
@@ -1650,9 +1650,18 @@ func (b *PlanBuilder) buildShow(ctx context.Context, show *ast.ShowStmt) (Plan,
 		proj.SetSchema(schema)
 		proj.SetChildren(np)
 		proj.SetOutputNames(np.OutputNames())
-		return proj, nil
-	}
-	return p, nil
+		np = proj
+	}
+	if show.Tp == ast.ShowVariables || show.Tp == ast.ShowStatus {
+		b.curClause = orderByClause
+		orderByCol := np.Schema().Columns[0].Clone().(*expression.Column)
+		sort := LogicalSort{
+			ByItems: []*ByItems{{Expr: orderByCol}},
+		}.Init(b.ctx, b.getSelectOffset())
+		sort.SetChildren(np)
+		np = sort
+	}
+	return np, nil
 }
 
 func (b *PlanBuilder) buildSimple(node ast.StmtNode) (Plan, error) {