bk commit into 5.1 tree (andrey:1.2271)

[ahristov]

Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-10 11:52:34+02:00, andrey@stripped +3 -0
  after merge update

  mysql-test/r/mysqldump.result@stripped, 2006-08-10 11:52:30+02:00, andrey@stripped +1 -1
    update result

  mysql-test/r/sp.result@stripped, 2006-08-10 11:52:30+02:00, andrey@stripped +7 -0
    after merge update

  mysql-test/t/mysqldump.test@stripped, 2006-08-10 11:52:31+02:00, andrey@stripped +1 -1
    update test

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	andrey
# Host:	example.com
# Root:	/work/mysql-5.1-runtime

--- 1.215/mysql-test/r/sp.result	2006-08-10 11:52:44 +02:00
+++ 1.216/mysql-test/r/sp.result	2006-08-10 11:52:44 +02:00
@@ -3620,11 +3620,18 @@
 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'|

--- 1.116/mysql-test/r/mysqldump.result	2006-08-10 11:52:44 +02:00
+++ 1.117/mysql-test/r/mysqldump.result	2006-08-10 11:52:44 +02:00
@@ -2279,7 +2279,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;

--- 1.110/mysql-test/t/mysqldump.test	2006-08-10 11:52:44 +02:00
+++ 1.111/mysql-test/t/mysqldump.test	2006-08-10 11:52:44 +02:00
@@ -951,7 +951,7 @@
 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;