add error code from planner, expression and executor (#650)

pingcap · Nov 27, 2019 · 37cd7d6 · 37cd7d6
1 parent 22c9e3f
commit 37cd7d6
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 43 deletions.
diff --git a/mysql/errcode.go b/mysql/errcode.go
@@ -934,48 +934,64 @@ const (
 	ErrSystemVersioningWrongPartitions      = 4128
 
 	// TiDB self-defined errors.
-	ErrMemExceedThreshold         = 8001
-	ErrForUpdateCantRetry         = 8002
-	ErrAdminCheckTable            = 8003
-	ErrTxnTooLarge                = 8004
-	ErrWriteConflictInTiDB        = 8005
-	ErrInvalidPluginID            = 8101
-	ErrInvalidPluginManifest      = 8102
-	ErrInvalidPluginName          = 8103
-	ErrInvalidPluginVersion       = 8104
-	ErrDuplicatePlugin            = 8105
-	ErrInvalidPluginSysVarName    = 8106
-	ErrRequireVersionCheckFail    = 8107
-	ErrUnsupportedReloadPlugin    = 8018
-	ErrUnsupportedReloadPluginVar = 8019
-	ErrTableLocked                = 8020
-	ErrNotExist                   = 8021
-	ErrTxnRetryable               = 8022
-	ErrCannotSetNilValue          = 8023
-	ErrInvalidTxn                 = 8024
-	ErrEntryTooLarge              = 8025
-	ErrNotImplemented             = 8026
-	ErrInfoSchemaExpired          = 8027
-	ErrInfoSchemaChanged          = 8028
-	ErrBadNumber                  = 8029
-	ErrCastAsSignedOverflow       = 8030
-	ErrCastNegIntAsUnsigned       = 8031
-	ErrInvalidYearFormat          = 8032
-	ErrInvalidYear                = 8033
-	ErrIncorrectDatetimeValue     = 8034
-	ErrInvalidTimeFormat          = 8036
-	ErrInvalidWeekModeFormat      = 8037
-	ErrFieldGetDefaultFailed      = 8038
-	ErrIndexOutBound              = 8039
-	ErrUnsupportedOp              = 8040
-	ErrRowNotFound                = 8041
-	ErrTableStateCantNone         = 8042
-	ErrColumnStateNonPublic       = 8043
-	ErrIndexStateCantNone         = 8044
-	ErrInvalidRecordKey           = 8045
-	ErrColumnStateCantNone        = 8046
-	ErrUnsupportedValueForVar     = 8047
-	ErrUnsupportedIsolationLevel  = 8048
+	ErrMemExceedThreshold                  = 8001
+	ErrForUpdateCantRetry                  = 8002
+	ErrAdminCheckTable                     = 8003
+	ErrTxnTooLarge                         = 8004
+	ErrWriteConflictInTiDB                 = 8005
+	ErrInvalidPluginID                     = 8101
+	ErrInvalidPluginManifest               = 8102
+	ErrInvalidPluginName                   = 8103
+	ErrInvalidPluginVersion                = 8104
+	ErrDuplicatePlugin                     = 8105
+	ErrInvalidPluginSysVarName             = 8106
+	ErrRequireVersionCheckFail             = 8107
+	ErrUnsupportedType                     = 8108
+	ErrAnalyzeMissIndex                    = 8109
+	ErrCartesianProductUnsupported         = 8110
+	ErrPreparedStmtNotFound                = 8111
+	ErrWrongParamCount                     = 8112
+	ErrSchemaChanged                       = 8113
+	ErrUnknownPlan                         = 8114
+	ErrPrepareMulti                        = 8115
+	ErrPrepareDDL                          = 8116
+	ErrResultIsEmpty                       = 8117
+	ErrBuildExecutor                       = 8118
+	ErrBatchInsertFail                     = 8119
+	ErrGetStartTS                          = 8120
+	ErrPrivilegeCheckFail                  = 8121
+	ErrInvalidWildCard                     = 8122
+	ErrMixOfGroupFuncAndFieldsIncompatible = 8123
+	ErrUnsupportedReloadPlugin             = 8018
+	ErrUnsupportedReloadPluginVar          = 8019
+	ErrTableLocked                         = 8020
+	ErrNotExist                            = 8021
+	ErrTxnRetryable                        = 8022
+	ErrCannotSetNilValue                   = 8023
+	ErrInvalidTxn                          = 8024
+	ErrEntryTooLarge                       = 8025
+	ErrNotImplemented                      = 8026
+	ErrInfoSchemaExpired                   = 8027
+	ErrInfoSchemaChanged                   = 8028
+	ErrBadNumber                           = 8029
+	ErrCastAsSignedOverflow                = 8030
+	ErrCastNegIntAsUnsigned                = 8031
+	ErrInvalidYearFormat                   = 8032
+	ErrInvalidYear                         = 8033
+	ErrIncorrectDatetimeValue              = 8034
+	ErrInvalidTimeFormat                   = 8036
+	ErrInvalidWeekModeFormat               = 8037
+	ErrFieldGetDefaultFailed               = 8038
+	ErrIndexOutBound                       = 8039
+	ErrUnsupportedOp                       = 8040
+	ErrRowNotFound                         = 8041
+	ErrTableStateCantNone                  = 8042
+	ErrColumnStateNonPublic                = 8043
+	ErrIndexStateCantNone                  = 8044
+	ErrInvalidRecordKey                    = 8045
+	ErrColumnStateCantNone                 = 8046
+	ErrUnsupportedValueForVar              = 8047
+	ErrUnsupportedIsolationLevel           = 8048
 
 	// Error codes used by TiDB ddl package
 	ErrUnsupportedDDLOperation  = 8200

diff --git a/mysql/errname.go b/mysql/errname.go
@@ -265,7 +265,7 @@ var MySQLErrName = map[uint16]string{
 	ErrIllegalReference:                         "Reference '%-.64s' not supported (%s)",
 	ErrDerivedMustHaveAlias:                     "Every derived table must have its own alias",
 	ErrSelectReduced:                            "Select %d was reduced during optimization",
-	ErrTablenameNotAllowedHere:                  "Table '%-.192s' from one of the SELECTs cannot be used in %-.32s",
+	ErrTablenameNotAllowedHere:                  "Table '%s' from one of the %ss cannot be used in %s",
 	ErrNotSupportedAuthMode:                     "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
 	ErrSpatialCantHaveNull:                      "All parts of a SPATIAL index must be NOT NULL",
 	ErrCollationCharsetMismatch:                 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
@@ -990,6 +990,23 @@ var MySQLErrName = map[uint16]string{
 	ErrCancelledDDLJob:            "Cancelled DDL job",
 	ErrRepairTable:                "Failed to repair table: %s",
 
+	ErrUnsupportedType:                     "Unsupported type %T",
+	ErrAnalyzeMissIndex:                    "Index '%s' in field list does not exist in table '%s'",
+	ErrCartesianProductUnsupported:         "Cartesian product is unsupported",
+	ErrPreparedStmtNotFound:                "Prepared statement not found",
+	ErrWrongParamCount:                     "Wrong parameter count",
+	ErrSchemaChanged:                       "Schema has changed",
+	ErrUnknownPlan:                         "Unknown plan",
+	ErrPrepareMulti:                        "Can not prepare multiple statements",
+	ErrPrepareDDL:                          "Can not prepare DDL statements with parameters",
+	ErrResultIsEmpty:                       "Result is empty",
+	ErrBuildExecutor:                       "Failed to build executor",
+	ErrBatchInsertFail:                     "Batch insert failed, please clean the table and try again.",
+	ErrGetStartTS:                          "Can not get start ts",
+	ErrPrivilegeCheckFail:                  "privilege check fail", // this error message should begin lowercased to be compatible with the test
+	ErrInvalidWildCard:                     "Wildcard fields without any table name appears in wrong place",
+	ErrMixOfGroupFuncAndFieldsIncompatible: "In aggregated query without GROUP BY, expression #%d of SELECT list contains nonaggregated column '%s'; this is incompatible with sql_mode=only_full_group_by",
+
 	// TiKV/PD errors.
 	ErrPDServerTimeout:    "PD server timeout",
 	ErrTiKVServerTimeout:  "TiKV server timeout",