From ea1bb8eeebb12cb2d3db60b29b270c533c83d1f9 Mon Sep 17 00:00:00 2001
From: siddontang <siddontang@gmail.com>
Date: Fri, 6 Nov 2015 17:02:28 +0800
Subject: [PATCH] ddl: ignore already deleted key when drop column

---
 ddl/column.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ddl/column.go b/ddl/column.go
index a9e0d4da96..df24f97617 100644
--- a/ddl/column.go
+++ b/ddl/column.go
@@ -413,7 +413,8 @@ func (d *ddl) dropTableColumn(t table.Table, colInfo *model.ColumnInfo, version
 		err = kv.RunInNewTxn(d.store, true, func(txn kv.Transaction) error {
 			for _, h := range handles {
 				key := t.RecordKey(h, col)
-				if err := txn.Delete(key); err != nil {
+				err := txn.Delete(key)
+				if err != nil && !terror.ErrorEqual(err, kv.ErrNotExist) {
 					return errors.Trace(err)
 				}
 			}