summaryrefslogtreecommitdiff
path: root/sql/sql_trigger.cc
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-01-14 19:56:00 +0200
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-01-14 19:59:34 +0200
commit66744f4540c464413055a79111c34449e8381618 (patch)
tree0905a1b2e47efb1dcd3dde1c9d5187fa45e780dc /sql/sql_trigger.cc
parent939d1255a78e374f468154f3353e5faa0fa517ca (diff)
parent20ca1bcf4bd81ed43683676276b5f27dc8da8e91 (diff)
downloadmariadb-git-66744f4540c464413055a79111c34449e8381618.tar.gz
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_trigger.cc')
-rw-r--r--sql/sql_trigger.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index 198f414eb85..b17775abb7c 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -2224,6 +2224,9 @@ void Table_triggers_list::mark_fields_used(trg_event_type event)
bitmap_set_bit(trigger_table->read_set, trg_field->field_idx);
if (trg_field->get_settable_routine_parameter())
bitmap_set_bit(trigger_table->write_set, trg_field->field_idx);
+ if (trigger_table->field[trg_field->field_idx]->vcol_info)
+ trigger_table->mark_virtual_col(trigger_table->
+ field[trg_field->field_idx]);
}
}
}