mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 10:15:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge MariaDB 5.2->5.3

Browse source
This commit is contained in:
unknown 2012-11-20 13:57:49 +01:00
commit ecf04668a2
17 changed files with 223 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/sql_delete.cc
View file

@ -333,7 +333,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,
triggers_applicable ? VCOL_UPDATE_ALL :
VCOL_UPDATE_FOR_READ);
thd->examined_row_count++;
// thd->is_error() is tested to disallow delete row on error
if (!select || select->skip_record(thd) > 0)