Commit 0d665bd5 authored by gkodinov/kgeorge@rakia.gmz's avatar gkodinov/kgeorge@rakia.gmz
Browse files

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  rakia.gmz:/home/kgeorge/mysql/autopush/B25382-5.0-opt
parents f3b3f1ef 20d94f11

mysql-test/r/udf.result

+34 −0
Original line number Diff line number Diff line
@@ -240,3 +240,37 @@ drop table bug18761; 
select is_const((1,2,3));

ERROR 21000: Operand should contain 1 column(s)

drop function if exists is_const;

CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB";

CREATE FUNCTION myfunc_double RETURNS REAL SONAME "UDF_EXAMPLE_LIB";

CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB";

create function f1(p1 varchar(255))

returns varchar(255)

begin

return metaphon(p1);

end//

create function f2(p1 varchar(255))

returns double

begin

return myfunc_double(p1);

end//

create function f3(p1 varchar(255))

returns double

begin

return myfunc_int(p1);

end//

select f3(NULL);

f3(NULL)

0

select f2(NULL);

f2(NULL)

NULL

select f1(NULL);

f1(NULL)

NULL

drop function f1;

drop function f2;

drop function f3;

drop function metaphon;

drop function myfunc_double;

drop function myfunc_int;

End of 5.0 tests.

mysql-test/t/udf.test

+47 −0
Original line number Diff line number Diff line
@@ -242,3 +242,50 @@ drop table bug18761; 
select is_const((1,2,3));



drop function if exists is_const;



#

# Bug #25382: Passing NULL to an UDF called from stored procedures 

# crashes server

#

--replace_result $UDF_EXAMPLE_LIB UDF_EXAMPLE_LIB

eval CREATE FUNCTION metaphon RETURNS STRING SONAME "$UDF_EXAMPLE_LIB";



--replace_result $UDF_EXAMPLE_LIB UDF_EXAMPLE_LIB

eval CREATE FUNCTION myfunc_double RETURNS REAL SONAME "$UDF_EXAMPLE_LIB";



--replace_result $UDF_EXAMPLE_LIB UDF_EXAMPLE_LIB

eval CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "$UDF_EXAMPLE_LIB";



delimiter //;

create function f1(p1 varchar(255))

returns varchar(255)

begin

  return metaphon(p1);

end//



create function f2(p1 varchar(255))

returns double

begin

  return myfunc_double(p1);

end//



create function f3(p1 varchar(255))

returns double

begin

  return myfunc_int(p1);

end//



delimiter ;//



select f3(NULL);

select f2(NULL);

select f1(NULL);



drop function f1;

drop function f2;

drop function f3;

drop function metaphon;

drop function myfunc_double;

drop function myfunc_int;



--echo End of 5.0 tests.

sql/item_func.cc

+6 −3
Original line number Diff line number Diff line
@@ -2729,25 +2729,28 @@ udf_handler::fix_fields(THD *thd, Item_result_field *func, 


      if (arguments[i]->const_item())

      {

        if (arguments[i]->null_value)

          continue;



        switch (arguments[i]->result_type()) 

        {

        case STRING_RESULT:

        case DECIMAL_RESULT:

        {

          String *res= arguments[i]->val_str(&buffers[i]);

          if (arguments[i]->null_value)

            continue;

          f_args.args[i]= (char*) res->ptr();

          break;

        }

        case INT_RESULT:

          *((longlong*) to)= arguments[i]->val_int();

          if (arguments[i]->null_value)

            continue;

          f_args.args[i]= to;

          to+= ALIGN_SIZE(sizeof(longlong));

          break;

        case REAL_RESULT:

          *((double*) to)= arguments[i]->val_real();

          if (arguments[i]->null_value)

            continue;

          f_args.args[i]= to;

          to+= ALIGN_SIZE(sizeof(double));

          break;