Commit 2834469c authored by unknown's avatar unknown
Browse files

after merge update 


mysql-test/r/mysqldump.result:
  update result
mysql-test/t/mysqldump.test:
  update test
parent b60873b1

mysql-test/r/mysqldump.result

+1 −1
Original line number Diff line number Diff line
@@ -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;

mysql-test/r/sp.result

+7 −0
Original line number Diff line number Diff line
@@ -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'|

mysql-test/t/mysqldump.test

+1 −1
Original line number Diff line number Diff line
@@ -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;