diff options
author | Sergei Golubchik <serg@mariadb.org> | 2016-03-21 13:02:53 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2016-03-21 13:02:53 +0100 |
commit | 3b0c7ac1f9d64afc933ce0354037c709366b7dff (patch) | |
tree | 39cefed54f79f93f82e9c33a4e094270103bf137 /sql/sql_trigger.cc | |
parent | e7cf898d6dc3dcac41f58db4761df3a6d1dffc03 (diff) | |
parent | 22ebf3cb456e0d8db295e7cc93f08e3d3ecfea47 (diff) | |
download | mariadb-git-3b0c7ac1f9d64afc933ce0354037c709366b7dff.tar.gz |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/sql_trigger.cc')
-rw-r--r-- | sql/sql_trigger.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 18563ff9b85..7a61279fc9c 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -2306,7 +2306,7 @@ void Table_triggers_list::mark_fields_used(trg_event_type event) /** - Signals to the Table_triggers_list that a parse error has occured when + Signals to the Table_triggers_list that a parse error has occurred when reading a trigger from file. This makes the Table_triggers_list enter an error state flagged by m_has_unparseable_trigger == true. The error message will be used whenever a statement invoking or manipulating triggers is |