From e4b8a64df4c2f37de2f273d8987c4b44beafe97b Mon Sep 17 00:00:00 2001
From: siddontang <siddontang@gmail.com>
Date: Mon, 23 Nov 2015 16:47:22 +0800
Subject: [PATCH] ddl: delete should skip ErrNotExist error.

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

diff --git a/ddl/reorg.go b/ddl/reorg.go
index c1420f151e..5e9ee5b072 100644
--- a/ddl/reorg.go
+++ b/ddl/reorg.go
@@ -23,6 +23,7 @@ import (
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/meta"
 	"github.com/pingcap/tidb/model"
+	"github.com/pingcap/tidb/terror"
 )
 
 var _ context.Context = &reorgContext{}
@@ -183,7 +184,8 @@ func (d *ddl) delKeysWithPrefix(prefix string) error {
 
 			for _, key := range keys {
 				err := txn.Delete([]byte(key))
-				if err != nil {
+				// must skip ErrNotExist
+				if err != nil && !terror.ErrorEqual(err, kv.ErrNotExist) {
 					return errors.Trace(err)
 				}
 			}