bk commit into 5.0 tree (cmiller:1.2057)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller 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.2057 06/03/06 10:44:01 cmiller@zippy.(none) +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr

  sql/sql_yacc.yy
    1.456 06/03/04 11:38:46 cmiller@zippy.(none) +0 -0
    Auto merged

  mysql-test/t/sp.test
    1.177 06/03/04 11:38:46 cmiller@zippy.(none) +0 -0
    Auto merged

  mysql-test/r/sp.result
    1.188 06/03/04 11:38:46 cmiller@zippy.(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:	cmiller
# Host:	zippy.(none)
# Root:	/home/cmiller/work/mysql/mysql-5.0.19-tbr/RESYNC

--- 1.187/mysql-test/r/sp.result	2006-03-03 12:51:10 -05:00
+++ 1.188/mysql-test/r/sp.result	2006-03-04 11:38:46 -05:00
@@ -4768,6 +4768,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

--- 1.176/mysql-test/t/sp.test	2006-03-03 12:51:10 -05:00
+++ 1.177/mysql-test/t/sp.test	2006-03-04 11:38:46 -05:00
@@ -5616,6 +5616,29 @@
 
 
 #
+# BUG#17615: problem with character set
+#
+--disable_warnings
+drop function if exists bug17615|
+--enable_warnings
+
+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|
+
+drop function bug17615|
+drop table t3|
+
+
+#
 # BUG#17476: Stored procedure not returning data when it is called first
 #            time per connection
 #