summaryrefslogtreecommitdiff
path: root/sql/sql_delete.cc
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-09-02 19:58:08 +0300
committerunknown <monty@hundin.mysql.fi>2001-09-02 19:58:08 +0300
commit3719b87396063fadf9a88a6acc6584f1321a7d6a (patch)
treec1066773b871f44ebb365c32dab0432f7da6da94 /sql/sql_delete.cc
parentfa7b17e904a73da0e938eac8e8d1503838d78202 (diff)
parentddee00a6edc735b3bbef42b7d0d662091debd560 (diff)
downloadmariadb-git-3719b87396063fadf9a88a6acc6584f1321a7d6a.tar.gz
merge
configure.in: Auto merged sql/ha_innobase.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/lock.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged
Diffstat (limited to 'sql/sql_delete.cc')
-rw-r--r--sql/sql_delete.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index d9b6970b72d..1a855c927a4 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -151,6 +151,8 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order,
break;
}
}
+ else
+ table->file->unlock_row(); // Row failed selection, release lock on it
}
thd->proc_info="end";
end_read_record(&info);