database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 5.5->5.5-mwl248

Browse Source
This commit is contained in:
Igor Babaev
2012-08-14 12:42:14 -07:00
parent 3116e3ad61 7cc2f8deca
commit 822e5da0d0
201 changed files with 6162 additions and 2267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_delete.cc
View File

@ -369,8 +369,14 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
}
}
}
else
/*
Don't try unlocking the row if skip_record reported an error since in
this case the transaction might have been rolled back already.
*/
else if (!thd->is_error())
table->file->unlock_row(); // Row failed selection, release lock on it
else
break;
}
killed_status= thd->killed;
if (killed_status != NOT_KILLED || thd->is_error())