summaryrefslogtreecommitdiff
path: root/mysql-test/r/sp.result
diff options
context:
space:
mode:
authorunknown <ramil@mysql.com>2006-03-03 09:35:25 +0400
committerunknown <ramil@mysql.com>2006-03-03 09:35:25 +0400
commitd95921376ca02d79009995a10cd2925a656a703d (patch)
tree2932160682b4d86bb2f6b1e788f5ef0e47b8901b /mysql-test/r/sp.result
parente2ba74b8252586bd27ace8603aab33c76b2b50cd (diff)
parent6ea2c3cd57e5be58bb84b94951b34dc055b178a6 (diff)
downloadmariadb-git-d95921376ca02d79009995a10cd2925a656a703d.tar.gz
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b17615 mysql-test/r/sp.result: merging mysql-test/t/sp.test: merging
Diffstat (limited to 'mysql-test/r/sp.result')
-rw-r--r--mysql-test/r/sp.result14
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index 0029c79450b..35292b31982 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -4768,6 +4768,20 @@ Handler
Inner
drop procedure bug15011|
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|
create table t3 ( d date )|
insert into t3 values