fix duplicate errcode

pingcap · Nov 11, 2019 · 7e37f16 · 7e37f16
1 parent 0e408bb
commit 7e37f16
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/mysql/errcode.go b/mysql/errcode.go
@@ -974,21 +974,23 @@ const (
 	ErrColumnStateCantNone        = 8046
 	ErrUnsupportedValueForVar     = 8047
 	ErrUnsupportedIsolationLevel  = 8048
-	ErrUnsupportedDDLOperation    = 8100
-	ErrNotOwner                   = 8101
-	ErrCantDecodeIndex            = 8102
-	ErrInvalidDDLWorker           = 8103
-	ErrInvalidDDLJob              = 8104
-	ErrInvalidDDLJobFlag          = 8105
-	ErrWaitReorgTimeout           = 8106
-	ErrInvalidStoreVersion        = 8107
-	ErrUnknownTypeLength          = 8108
-	ErrUnknownFractionLength      = 8109
-	ErrInvalidDDLState            = 8110
-	ErrReorgPanic                 = 8111
-	ErrInvalidSplitRegionRanges   = 8112
-	ErrInvalidJobVersion          = 8113
-	ErrCancelledDDLJob            = 8114
+
+	// Error codes used by TiDB ddl package
+	ErrUnsupportedDDLOperation  = 8200
+	ErrNotOwner                 = 8201
+	ErrCantDecodeIndex          = 8202
+	ErrInvalidDDLWorker         = 8203
+	ErrInvalidDDLJob            = 8204
+	ErrInvalidDDLJobFlag        = 8205
+	ErrWaitReorgTimeout         = 8206
+	ErrInvalidStoreVersion      = 8207
+	ErrUnknownTypeLength        = 8208
+	ErrUnknownFractionLength    = 8209
+	ErrInvalidDDLState          = 8210
+	ErrReorgPanic               = 8211
+	ErrInvalidSplitRegionRanges = 8212
+	ErrInvalidDDLJobVersion     = 8213
+	ErrCancelledDDLJob          = 8214
 
 	// TiKV/PD errors.
 	ErrPDServerTimeout    = 9001

diff --git a/mysql/errname.go b/mysql/errname.go
@@ -980,7 +980,7 @@ var MySQLErrName = map[uint16]string{
 	ErrInvalidStoreVersion:        "Invalid storage current version: %d",
 	ErrUnknownTypeLength:          "Unknown length for type %d",
 	ErrUnknownFractionLength:      "Unknown length for type %d and fraction %d",
-	ErrInvalidJobVersion:          "Version %d of DDL job is greater than current one: %d",
+	ErrInvalidDDLJobVersion:       "Version %d of DDL job is greater than current one: %d",
 	ErrInvalidSplitRegionRanges:   "Failed to split region ranges",
 	ErrReorgPanic:                 "Reorg worker panic",
 	ErrInvalidDDLState:            "Invalid %s state: %s",