diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-06-05 10:50:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-06-05 10:50:08 +0400 |
| commit | ab297744b7318645159cd5f9ec26378473cecf52 (patch) | |
| tree | 28df98886259f9df535b84deff18a89e08064e58 /sql/sql_signal.cc | |
| parent | 8760acdda88cc5ead925024bc47df4d27f911bb0 (diff) | |
| parent | 106f0b5798a2b5d13b7d67c3cc678fc0cc2184c2 (diff) | |
| download | mariadb-git-ab297744b7318645159cd5f9ec26378473cecf52.tar.gz | |
Merge remote-tracking branch 'origin/10.3' into 10.4
Diffstat (limited to 'sql/sql_signal.cc')
| -rw-r--r-- | sql/sql_signal.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sql/sql_signal.cc b/sql/sql_signal.cc index 7a28ba65ba2..a92d40f6bb3 100644 --- a/sql/sql_signal.cc +++ b/sql/sql_signal.cc @@ -218,16 +218,9 @@ int Sql_cmd_common_signal::eval_signal_informations(THD *thd, Sql_condition *con i <= LAST_DIAG_SET_PROPERTY; i++) { - set= m_set_signal_information.m_item[i]; - if (set) - { - if (! set->fixed) - { - if (set->fix_fields(thd, & set)) - goto end; - m_set_signal_information.m_item[i]= set; - } - } + if ((set= m_set_signal_information.m_item[i]) && + set->fix_fields_if_needed(thd, &m_set_signal_information.m_item[i])) + goto end; } /* |