1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge branch '10.0' into 10.0-galera

This commit is contained in:
Nirbhay Choubey
2016-04-29 16:50:58 -04:00
367 changed files with 4211 additions and 1392 deletions

View File

@ -2238,7 +2238,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