Merge MariaDB 10.0-base to MariaDB 10.0

This commit is contained in:
unknown 2012-12-18 15:01:58 +01:00
commit 701419b02f
225 changed files with 10935 additions and 1682 deletions

View file

@ -330,7 +330,9 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
! thd->is_error())
{
if (table->vfield)
update_virtual_fields(thd, table);
update_virtual_fields(thd, table,
table->triggers ? VCOL_UPDATE_ALL :
VCOL_UPDATE_FOR_READ);
thd->inc_examined_row_count(1);
// thd->is_error() is tested to disallow delete row on error
if (!select || select->skip_record(thd) > 0)