Merge branch 'master' into make-changefeed-sort-dir-visible

pingcap · Jul 5, 2021 · 88c92c0 · 88c92c0
2 parents 66e8cca + 3c0be0d
commit 88c92c0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/cmd/client.go b/cmd/client.go
@@ -256,7 +256,8 @@ func loop() {
 		command := newCliCommand()
 		command.SetArgs(args)
 		_ = command.ParseFlags(args)
-		command.SetOutput(os.Stdout)
+		command.SetOut(os.Stdout)
+		command.SetErr(os.Stdout)
 		if err = command.Execute(); err != nil {
 			command.Println(err)
 		}

diff --git a/cmd/client_tso.go b/cmd/client_tso.go
@@ -45,6 +45,7 @@ func newQueryTsoCommand() *cobra.Command {
 			return nil
 		},
 	}
-	command.SetOutput(os.Stdout)
+	command.SetOut(os.Stdout)
+	command.SetErr(os.Stdout)
 	return command
 }
diff --git a/cmd/root.go b/cmd/root.go
@@ -27,7 +27,7 @@ var rootCmd = &cobra.Command{
 
 // Execute runs the root command
 func Execute() {
-	// Ouputs cmd.Print to stdout.
+	// Outputs cmd.Print to stdout.
 	rootCmd.SetOut(os.Stdout)
 	if err := rootCmd.Execute(); err != nil {
 		rootCmd.Println(err)