Linting

ddl/partition.go

@@ -2318,9 +2318,9 @@ func (w *worker) onAlterTablePartitioning(d *ddlCtx, t *meta.Meta, job *model.Jo
 		physicalTableIDs := getPartitionIDsFromDefinitions(tblInfo.Partition.DroppingDefinitions)
 		newIDs := getPartitionIDsFromDefinitions(partInfo.Definitions)
 		job.CtxVars = []interface{}{physicalTableIDs, newIDs}
-		oldTblId := tblInfo.ID
+		oldTblID := tblInfo.ID
 		// If no global index this is not really needed?
-		physicalTableIDs = append(physicalTableIDs, oldTblId)
+		physicalTableIDs = append(physicalTableIDs, oldTblID)
 		err = t.DropTableOrView(job.SchemaID, tblInfo.ID)
 		if err != nil {
 			job.State = model.JobStateCancelled
@@ -2346,6 +2346,9 @@ func (w *worker) onAlterTablePartitioning(d *ddlCtx, t *meta.Meta, job *model.Jo
 		tblInfo.Partition.NewTableID = 0
 
 		err = t.CreateTableOrView(job.SchemaID, tblInfo)
+		if err != nil {
+			return ver, errors.Trace(err)
+		}
 		ver, err = updateVersionAndTableInfo(d, t, job, tblInfo, true)
 		failpoint.Inject("reorgPartWriteReorgSchemaVersionUpdateFail", func(val failpoint.Value) {
 			if val.(bool) {

parser/model/model.go

@@ -1113,14 +1113,15 @@ type PartitionType int
 
 // Partition types.
 const (
+	// Actually non-partitioned, but during DDL keeping the table as
+	// a single partition
+	PartitionTypeNone PartitionType = 0
+
 	PartitionTypeRange      PartitionType = 1
 	PartitionTypeHash       PartitionType = 2
 	PartitionTypeList       PartitionType = 3
 	PartitionTypeKey        PartitionType = 4
 	PartitionTypeSystemTime PartitionType = 5
-	// Actually non-partitioned, but during DDL keeping the table as
-	// a single partition
-	PartitionTypeNone PartitionType = 6
 )
 
 func (p PartitionType) String() string {