executor: merge

pingcap · Nov 8, 2018 · 58462e4 · 58462e4
1 parent 070792d
commit 58462e4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/executor/insert_common.go b/executor/insert_common.go
@@ -113,7 +113,7 @@ func (e *InsertValues) initInsertColumns() error {
 	for _, col := range cols {
 		if col.Name.L == model.ExtraHandleName.L {
 			if !e.ctx.GetSessionVars().AllowWriteRowID {
-				return nil, errors.Errorf("insert, update and replace statements for _tidb_rowid are not supported.")
+				return errors.Errorf("insert, update and replace statements for _tidb_rowid are not supported.")
 			}
 			e.hasExtraHandle = true
 			break