bk commit into 5.1 tree (msvensson:1.2152)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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
  1.2152 06/03/06 14:03:16 msvensson@neptunus.(none) +2 -0
  Merge bk-internal:/home/bk/mysql-5.1-new
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

  mysql-test/r/sp.result
    1.195 06/03/06 14:03:08 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/binary.result
    1.23 06/03/06 14:03:08 msvensson@neptunus.(none) +0 -0
    Auto merged

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1/RESYNC

--- 1.194/mysql-test/r/sp.result	2006-03-06 11:35:33 +01:00
+++ 1.195/mysql-test/r/sp.result	2006-03-06 14:03:08 +01:00
@@ -4778,6 +4778,20 @@
 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