This is an automated cherry-pick of #45369

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
pingcap · Jul 14, 2023 · 3aa0f5e · 3aa0f5e
1 parent 905a155
commit 3aa0f5e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/br/pkg/lightning/config/config.go b/br/pkg/lightning/config/config.go
@@ -745,6 +745,15 @@ func NewConfig() *Config {
 			Checksum:          OpLevelRequired,
 			Analyze:           OpLevelOptional,
 			PostProcessAtLast: true,
+<<<<<<< HEAD
+=======
+			ChecksumViaSQL:    false,
+		},
+		Conflict: Conflict{
+			Strategy:      "",
+			Threshold:     -1,
+			MaxRecordRows: -1,
+>>>>>>> fe5625ec74f (lightning:set default value of checksum-via-sql to false (#45369))
 		},
 	}
 }

diff --git a/br/tests/lightning_add_index/config1.toml b/br/tests/lightning_add_index/config1.toml
@@ -0,0 +1,6 @@
+[tikv-importer]
+backend = 'local'
+add-index-by-sql = false
+
+[post-restore]
+checksum-via-sql = true