summaryrefslogtreecommitdiff
path: root/sql/sql_signal.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_signal.cc')
-rw-r--r--sql/sql_signal.cc13
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;
}
/*