Commit dfae81d0 authored by kent@mysql.com's avatar kent@mysql.com

Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
parents 8da2410a 1a071405
...@@ -4778,6 +4778,20 @@ Handler ...@@ -4778,6 +4778,20 @@ Handler
Inner Inner
drop procedure bug15011| drop procedure bug15011|
drop table t3| drop table t3|
drop function if exists bug17615|
create table t3 (a varchar(256) unicode)|
create function bug17615() returns varchar(256) unicode
begin
declare tmp_res varchar(256) unicode;
set tmp_res= 'foo string';
return tmp_res;
end|
insert into t3 values(bug17615())|
select * from t3|
a
foo string
drop function bug17615|
drop table t3|
drop procedure if exists bug17476| drop procedure if exists bug17476|
create table t3 ( d date )| create table t3 ( d date )|
insert into t3 values insert into t3 values
......
...@@ -5621,6 +5621,28 @@ drop table t3| ...@@ -5621,6 +5621,28 @@ drop table t3|
# #
# BUG#17615: problem with character set
#
--disable_warnings
drop function if exists bug17615|
--enable_warnings
create table t3 (a varchar(256) unicode)|
create function bug17615() returns varchar(256) unicode
begin
declare tmp_res varchar(256) unicode;
set tmp_res= 'foo string';
return tmp_res;
end|
insert into t3 values(bug17615())|
select * from t3|
drop function bug17615|
drop table t3|
# BUG#17476: Stored procedure not returning data when it is called first # BUG#17476: Stored procedure not returning data when it is called first
# time per connection # time per connection
# #
......
...@@ -4881,6 +4881,7 @@ Item_func_sp::fix_length_and_dec() ...@@ -4881,6 +4881,7 @@ Item_func_sp::fix_length_and_dec()
{ {
decimals= result_field->decimals(); decimals= result_field->decimals();
max_length= result_field->field_length; max_length= result_field->field_length;
collation.set(result_field->charset());
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
...@@ -4891,6 +4892,7 @@ Item_func_sp::fix_length_and_dec() ...@@ -4891,6 +4892,7 @@ Item_func_sp::fix_length_and_dec()
} }
decimals= field->decimals(); decimals= field->decimals();
max_length= field->field_length; max_length= field->field_length;
collation.set(field->charset());
maybe_null= 1; maybe_null= 1;
delete field; delete field;
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
......
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