database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge with MySQL 5.5.27

Browse Source 
manually checked every change, reverted incorrect or stupid changes.
This commit is contained in:
Sergei Golubchik
2012-08-09 17:22:00 +02:00
parent e022b6ef07 704898bf32
commit d11829654c
122 changed files with 2869 additions and 1727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_delete.cc
View File

@ -368,8 +368,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())