From eba9109225b2bebda9a78be47fbc8de71b47f991 Mon Sep 17 00:00:00 2001
From: "andrey@example.com" <>
Date: Thu, 10 Aug 2006 11:52:34 +0200
Subject: [PATCH] after merge update

---
 mysql-test/r/mysqldump.result | 2 +-
 mysql-test/r/sp.result        | 7 +++++++
 mysql-test/t/mysqldump.test   | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index f01d8f6160e..153ddb7ca2b 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -2279,7 +2279,7 @@ INSERT INTO t1 VALUES(1), (2), (3), (4), (5);
 CREATE FUNCTION `bug9056_func1`(a INT, b INT) RETURNS int(11) RETURN a+b //
 CREATE PROCEDURE `bug9056_proc1`(IN a INT, IN b INT, OUT c INT)
 BEGIN SELECT a+b INTO c; end  //
-create function bug9056_func2(f1 char binary) returns char binary
+create function bug9056_func2(f1 char binary) returns char
 begin
 set f1= concat( 'hello', f1 );
 return f1;
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index ec4065fbc1d..8ff180044df 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -3620,11 +3620,18 @@ call bug11333(10)|
 drop procedure bug11333|
 drop table t3|
 drop function if exists bug9048|
+create function bug9048(f1 char binary) returns char
+begin
+set f1= concat( 'hello', f1 );
+return f1;
+end|
+drop function bug9048|
 create function bug9048(f1 char binary) returns char binary
 begin
 set f1= concat( 'hello', f1 );
 return f1;
 end|
+ERROR 42000: This version of MySQL doesn't yet support 'return value collation'
 drop procedure if exists bug12849_1|
 create procedure bug12849_1(inout x char) select x into x|
 set @var='a'|
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index 8acc29fcc50..c40a21e0ca0 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -951,7 +951,7 @@ CREATE FUNCTION `bug9056_func1`(a INT, b INT) RETURNS int(11) RETURN a+b //
 CREATE PROCEDURE `bug9056_proc1`(IN a INT, IN b INT, OUT c INT)
 BEGIN SELECT a+b INTO c; end  //
 
-create function bug9056_func2(f1 char binary) returns char binary
+create function bug9056_func2(f1 char binary) returns char
 begin
   set f1= concat( 'hello', f1 );
   return f1;