diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-09-17 12:31:38 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-09-17 12:31:38 +0300 |
| commit | 7b791250a1d2f293da83533fc332fd1d80f665a1 (patch) | |
| tree | 85f8b21478422a123a8b128ffd471b98a53150c4 /sql/sql_trigger.cc | |
| parent | f4862acfc389864f99100f66abe905c1f5be9e80 (diff) | |
| parent | 6f94b5c76d51e655d36198d177972caa18089e31 (diff) | |
| download | mariadb-git-7b791250a1d2f293da83533fc332fd1d80f665a1.tar.gz | |
References lp:1051808 - merged with lp:maria/5.5
bzr merge lp:maria/5.5
...
Text conflict in CMakeLists.txt
Text conflict in sql/mysqld.cc
Text conflict in sql/sql_class.h
Text conflict in sql/sql_truncate.cc
4 conflicts encountered.
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 00baa0b596f..b0dd2183b62 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -1334,6 +1334,7 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db, triggers->definitions_list.elements); table->triggers= triggers; + status_var_increment(thd->status_var.feature_trigger); /* TODO: This could be avoided if there is no triggers @@ -2116,6 +2117,8 @@ bool Table_triggers_list::process_triggers(THD *thd, if (sp_trigger == NULL) return FALSE; + status_var_increment(thd->status_var.executed_triggers); + if (old_row_is_record1) { old_field= record1_field; |