Commit dd036077 authored by petr@mysql.com's avatar petr@mysql.com

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

into  mysql.com:/home/cps/mysql/trees/mysql-5.0
parents 9a649910 e9659d21
...@@ -3264,4 +3264,12 @@ bug131333() ...@@ -3264,4 +3264,12 @@ bug131333()
NULL NULL
drop procedure bug131333| drop procedure bug131333|
drop function bug131333| drop function bug131333|
drop procedure if exists bug13124|
create procedure bug13124()
begin
declare y integer;
set @x=y;
end|
call bug13124()|
drop procedure bug13124|
drop table t1,t2; drop table t1,t2;
...@@ -4107,6 +4107,20 @@ select bug131333()| ...@@ -4107,6 +4107,20 @@ select bug131333()|
drop procedure bug131333| drop procedure bug131333|
drop function bug131333| drop function bug131333|
#
# Bug #13124 Stored Procedure using SELECT INTO crashes server
#
--disable_warnings
drop procedure if exists bug13124|
--enable_warnings
create procedure bug13124()
begin
declare y integer;
set @x=y;
end|
call bug13124()|
drop procedure bug13124|
# #
# BUG#NNNN: New bug synopsis # BUG#NNNN: New bug synopsis
......
...@@ -818,6 +818,8 @@ String *Item_splocal::val_str(String *sp) ...@@ -818,6 +818,8 @@ String *Item_splocal::val_str(String *sp)
DBUG_ASSERT(fixed); DBUG_ASSERT(fixed);
Item *it= this_item(); Item *it= this_item();
String *ret= it->val_str(sp); String *ret= it->val_str(sp);
null_value= it->null_value;
/* /*
This way we mark returned value of val_str as const, This way we mark returned value of val_str as const,
so that various functions (e.g. CONCAT) won't try to so that various functions (e.g. CONCAT) won't try to
...@@ -833,9 +835,12 @@ String *Item_splocal::val_str(String *sp) ...@@ -833,9 +835,12 @@ String *Item_splocal::val_str(String *sp)
This is intended behaviour of Item_func_concat. Comments to This is intended behaviour of Item_func_concat. Comments to
Item_param class contain some more details on the topic. Item_param class contain some more details on the topic.
*/ */
if (!ret)
return NULL;
str_value_ptr.set(ret->ptr(), ret->length(), str_value_ptr.set(ret->ptr(), ret->length(),
ret->charset()); ret->charset());
null_value= it->null_value;
return &str_value_ptr; return &str_value_ptr;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment