diff options
author | kostja@bodhi.local <> | 2006-07-07 22:09:43 +0400 |
---|---|---|
committer | kostja@bodhi.local <> | 2006-07-07 22:09:43 +0400 |
commit | 7bf73ac3e5359e7d9282cdb65369bd4a5cafc882 (patch) | |
tree | 9baffd6140dc110806fd9c5531adf2e4f85fb6d0 /sql/item.cc | |
parent | 31ddb041058f6ee0ad0527fa2ff5ea15bae12e36 (diff) | |
parent | b429748fabb7e3fe6c3dd0271b2d0660c87120ee (diff) | |
download | mariadb-git-7bf73ac3e5359e7d9282cdb65369bd4a5cafc882.tar.gz |
Merge bodhi.local:/opt/local/work/mysql-5.0-root
into bodhi.local:/opt/local/work/mysql-5.0-runtime
Diffstat (limited to 'sql/item.cc')
-rw-r--r-- | sql/item.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index a50356e331c..511ea1ffb44 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -5373,9 +5373,14 @@ void Item_insert_value::print(String *str) void Item_trigger_field::setup_field(THD *thd, TABLE *table, GRANT_INFO *table_grant_info) { + /* + There is no sense in marking fields used by trigger with current value + of THD::query_id since it is completely unrelated to the THD::query_id + value for statements which will invoke trigger. So instead we use + Table_triggers_list::mark_fields_used() method which is called during + execution of these statements. + */ bool save_set_query_id= thd->set_query_id; - - /* TODO: Think more about consequences of this step. */ thd->set_query_id= 0; /* Try to find field by its name and if it will be found |