Merge #38433

38433: sql: fix swallowing Unsplit error r=jeffrey-xiao a=jeffrey-xiao Realized this condition should be negated. Fixes #38131, #38095. Release note: None Co-authored-by: Jeffrey Xiao <[email protected]>
cockroachdb · Jun 26, 2019 · c836e59 · c836e59
2 parents ac1900a + 922f297
commit c836e59
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/sql/drop_index.go b/pkg/sql/drop_index.go
@@ -244,7 +244,7 @@ func (p *planner) dropIndexByName(
 					// Swallow "key is not the start of a range" errors because it would
 					// mean that the sticky bit was removed and merged concurrently. DROP
 					// INDEX should not fail because of this.
-					if err := p.ExecCfg().DB.AdminUnsplit(ctx, desc.StartKey); err != nil && strings.Contains(err.Error(), "is not the start of a range") {
+					if err := p.ExecCfg().DB.AdminUnsplit(ctx, desc.StartKey); err != nil && !strings.Contains(err.Error(), "is not the start of a range") {
 						return err
 					}
 				}

diff --git a/pkg/sql/drop_table.go b/pkg/sql/drop_table.go
@@ -368,7 +368,7 @@ func (p *planner) initiateDropTable(
 			// Swallow "key is not the start of a range" errors because it would mean
 			// that the sticky bit was removed and merged concurrently. DROP TABLE
 			// should not fail because of this.
-			if err := p.ExecCfg().DB.AdminUnsplit(ctx, desc.StartKey); err != nil && strings.Contains(err.Error(), "is not the start of a range") {
+			if err := p.ExecCfg().DB.AdminUnsplit(ctx, desc.StartKey); err != nil && !strings.Contains(err.Error(), "is not the start of a range") {
 				return err
 			}
 		}