Commit 9381c8a0 authored by unknown's avatar unknown
Browse files

Fixed BUG#18787: Server crashed when calling a stored procedure containing 

                 a misnamed function
  ... in the presence of a continue handler. The problem was that with a
  handler, it continued to execute as if function existed and had set a
  useful return value (which it hadn't).
  The fix is to set a null return value and do an error return when a function
  wasn't found.


mysql-test/r/sp.result:
  Updated results for a new test case (BUG#18787).
mysql-test/t/sp.test:
  New testcase for BUG#18787.
sql/item_func.cc:
  Don't set "out of resources" error in Item_func_sp::execute() if no
  result field is returned, it's simply wrong, it can be sometthing else,
  like a function not found. Instead set null_value and return error.
  Also, set "out of resources" when field creation fails in
  Item_func_sp::sp_result_field() and Item_func_sp::tmp_table_field().
parent daac3886

mysql-test/r/sp.result

+10 −0
Original line number Diff line number Diff line
@@ -4837,4 +4837,14 @@ c 2 
b	3

a	1

delete from t1|

drop procedure if exists bug18787|

create procedure bug18787()

begin

declare continue handler for sqlexception begin end;

select no_such_function();

end|

call bug18787()|

no_such_function()

NULL

drop procedure bug18787|

drop table t1,t2;

mysql-test/t/sp.test

+18 −0
Original line number Diff line number Diff line
@@ -5683,6 +5683,24 @@ select * from t1 order by @x| 
delete from t1|





#

# BUG#18787: Server crashed when calling a stored procedure containing

#            a misnamed function

#

--disable_warnings

drop procedure if exists bug18787|

--enable_warnings

create procedure bug18787()

begin

  declare continue handler for sqlexception begin end;



  select no_such_function();

end|



call bug18787()|

drop procedure bug18787|





#

# BUG#NNNN: New bug synopsis

#

sql/item_func.cc

+9 −3
Original line number Diff line number Diff line
@@ -4722,7 +4722,9 @@ Item_func_sp::sp_result_field(void) const 
    share->table_cache_key = empty_name;

    share->table_name = empty_name;

  }

  field= m_sp->create_result_field(max_length, name, dummy_table);

  if (!(field= m_sp->create_result_field(max_length, name, dummy_table)))

    my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));



  DBUG_RETURN(field);

}
@@ -4750,8 +4752,9 @@ Item_func_sp::execute(Field **flp) 
  {

    if (!(*flp= f= sp_result_field()))

    {

      my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));

      return 0;

      /* Error set by sp_result_field() */

      null_value= 1;

      return TRUE;

    }



    f->move_field((f->pack_length() > sizeof(result_buf)) ?
@@ -4915,6 +4918,9 @@ Item_func_sp::tmp_table_field(TABLE *t_arg) 
  if (!res) 

    res= Item_func::tmp_table_field(t_arg);



  if (!res)

    my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));



  DBUG_RETURN(res);

}