Commit d9142f99 authored by unknown's avatar unknown
Browse files

Post-review fix for BUG#18787. Renamed a local variable in

Item_func_sp::tmp_table_field() to something more descriptive.


sql/item_func.cc:
  Renamed local variable 'res' to 'field' in Item_func_sp::tmp_table_field(),
  because it is.
parent 9381c8a0
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -4909,19 +4909,19 @@ longlong Item_func_found_rows::val_int()
Field *
Item_func_sp::tmp_table_field(TABLE *t_arg)
{
  Field *res= 0;
  Field *field= 0;
  DBUG_ENTER("Item_func_sp::tmp_table_field");

  if (m_sp)
    res= m_sp->create_result_field(max_length, (const char*) name, t_arg);
    field= m_sp->create_result_field(max_length, (const char*) name, t_arg);
  
  if (!res) 
    res= Item_func::tmp_table_field(t_arg);
  if (!field) 
    field= Item_func::tmp_table_field(t_arg);

  if (!res)
  if (!field)
    my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));

  DBUG_RETURN(res);
  DBUG_RETURN(field);
}