Merge branch 'master' into ignore-config

pingcap · Jul 14, 2022 · 438b082 · 438b082
2 parents caf8a23 + de5991d
commit 438b082
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/components/playground/instance/ticdc.go b/components/playground/instance/ticdc.go
@@ -63,6 +63,9 @@ func (c *TiCDC) Start(ctx context.Context, version utils.Version) error {
 	}
 	clusterVersion := string(version)
 	if tidbver.TiCDCSupportConfigFile(clusterVersion) {
+		if c.ConfigPath != "" {
+			args = append(args, fmt.Sprintf("--config=%s", c.ConfigPath))
+		}
 		if tidbver.TiCDCSupportDataDir(clusterVersion) {
 			args = append(args, fmt.Sprintf("--data-dir=%s", filepath.Join(c.Dir, "data")))
 		} else {

diff --git a/doc/user/README.md b/doc/user/README.md
@@ -4,7 +4,7 @@
 
 For detailed documentation, see the manual which starts with an [overview](overview.md).
 
-To get started with TiDB using TiUP, see the [TiDB quick start guide](https://docs.pingcap.com/tidb/stable/quick-start-with-tidb). To deploy TiDB using TiUP in a production-like environment, see the [TiDB deploymeny guide](https://docs.pingcap.com/tidb/stable/production-deployment-using-tiup).
+To get started with TiDB using TiUP, see the [TiDB quick start guide](https://docs.pingcap.com/tidb/stable/quick-start-with-tidb). To deploy TiDB using TiUP in a production-like environment, see the [TiDB deployment guide](https://docs.pingcap.com/tidb/stable/production-deployment-using-tiup).
 
 ## Installation