address comment

ddl/ddl.go

@@ -96,7 +96,7 @@ var (
 	errIncorrectPrefixKey   = terror.ClassDDL.New(codeIncorrectPrefixKey, "Incorrect prefix key; the used key part isn't a string, the used length is longer than the key part, or the storage engine doesn't support unique prefix keys")
 	errTooLongKey           = terror.ClassDDL.New(codeTooLongKey,
 		fmt.Sprintf("Specified key was too long; max key length is %d bytes", maxPrefixLength))
-	errKeyColumnDoesNotExits    = terror.ClassDDL.New(codeKeyColumnDoesNotExits, "this key column doesn't exist in table")
+	errKeyColumnDoesNotExits    = terror.ClassDDL.New(codeKeyColumnDoesNotExits, mysql.MySQLErrName[mysql.ErrKeyColumnDoesNotExits])
 	errUnknownTypeLength        = terror.ClassDDL.New(codeUnknownTypeLength, "Unknown length for type tp %d")
 	errUnknownFractionLength    = terror.ClassDDL.New(codeUnknownFractionLength, "Unknown Length for type tp %d and fraction %d")
 	errInvalidJobVersion        = terror.ClassDDL.New(codeInvalidJobVersion, "DDL job with version %d greater than current %d")

ddl/ddl_api.go

@@ -728,7 +728,7 @@ func buildTableInfo(ctx sessionctx.Context, d *ddl, tableName model.CIStr, cols
 			fk.State = model.StatePublic
 			for _, key := range constr.Keys {
 				if !table.FindColInfo(tbInfo.Columns, key.Column.Name.O) {
-					return nil, errKeyColumnDoesNotExits.GenWithStack("key column %s doesn't exist in table", key.Column.Name)
+					return nil, errKeyColumnDoesNotExits.GenWithStackByArgs(key.Column.Name)
 				}
 				fk.Cols = append(fk.Cols, key.Column.Name)
 			}
@@ -752,7 +752,7 @@ func buildTableInfo(ctx sessionctx.Context, d *ddl, tableName model.CIStr, cols
 			for _, key := range constr.Keys {
 				col = table.FindCol(cols, key.Column.Name.O)
 				if col == nil {
-					return nil, errKeyColumnDoesNotExits.GenWithStack("key column %s doesn't exist in table", key.Column.Name)
+					return nil, errKeyColumnDoesNotExits.GenWithStackByArgs(key.Column.Name)
 				}
 				// Virtual columns cannot be used in primary key.
 				if col.IsGenerated() && !col.GeneratedStored {

executor/executor_test.go

@@ -308,7 +308,7 @@ func (s *testSuite) TestTableForeignKey(c *C) {
 	tk.MustExec("use test")
 	tk.MustExec("create table t1 (a int, b int);")
 	_, err := tk.Exec("create table t2 (c int, foreign key (a) references t1(a));")
-	c.Assert(err.Error(), Equals, "[ddl:1072]key column a doesn't exist in table")
+	c.Assert(err.Error(), Equals, "[ddl:1072]Key column 'a' doesn't exist in table")
 	tk.MustExec("drop table if exists t1,t2;")
 }