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 mariadb 5.3->mariadb 5.5

Browse Source
This commit is contained in:
unknown
2012-03-24 18:21:22 +01:00
parent b34cfe9327 f72e0e686b
commit 335de5db18
42 changed files with 893 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_delete.cc
View File

@ -327,7 +327,8 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
while (!(error=info.read_record(&info)) && !thd->killed &&
! thd->is_error())
{
update_virtual_fields(thd, table);
if (table->vfield)
update_virtual_fields(thd, table);
thd->examined_row_count++;
// thd->is_error() is tested to disallow delete row on error
if (!select || select->skip_record(thd) > 0)