diff options
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 3a9e83d9d09..ea3ddcf617d 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -75,9 +75,8 @@ sp_map_item_type(const Type_handler *handler) { if (handler == &type_handler_row) return Item::ROW_ITEM; - enum_field_types type= real_type_to_type(handler->real_field_type()); - switch (type) { + switch (handler->real_field_type()) { case MYSQL_TYPE_BIT: case MYSQL_TYPE_TINY: case MYSQL_TYPE_SHORT: @@ -4573,7 +4572,7 @@ sp_instr_set_case_expr::exec_core(THD *thd, uint *nextp) thd->spcont->set_case_expr(thd, m_case_expr_id, &null_item)) { /* If this also failed, we have to abort. */ - my_error(ER_OUT_OF_RESOURCES, MYF(ME_FATALERROR)); + my_error(ER_OUT_OF_RESOURCES, MYF(ME_FATAL)); } } else |