bk commit into 5.1 tree (kostja:1.2578)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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, 2007-04-14 18:35:09-04:00, kostja@vajra.(none) +2 -0
  Merge vajra.(none):/opt/local/work/mysql-5.0-runtime
  into  vajra.(none):/opt/local/work/mysql-5.1-runtime
  MERGE: 1.1810.2374.122

  mysql-test/r/sp.result@stripped, 2007-04-14 18:35:00-04:00, kostja@vajra.(none) +0 -50
    Use local
    MERGE: 1.170.28.11

  mysql-test/t/sp.test@stripped, 2007-04-14 18:33:15-04:00, kostja@vajra.(none) +0 -0
    Auto merged
    MERGE: 1.174.28.10

# 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:	kostja
# Host:	vajra.(none)
# Root:	/opt/local/work/mysql-5.1-runtime/RESYNC

--- 1.228/mysql-test/t/sp.test	2007-04-04 05:05:06 -04:00
+++ 1.229/mysql-test/t/sp.test	2007-04-14 18:33:15 -04:00
@@ -7068,6 +7068,44 @@
 drop function bug20777;
 delimiter |;
 
+
+#
+# BUG#5274: Stored procedure crash if length of CHAR variable too great.
+#
+
+# Prepare.
+
+--disable_warnings
+DROP FUNCTION IF EXISTS bug5274_f1|
+DROP FUNCTION IF EXISTS bug5274_f2|
+--enable_warnings
+
+# Test.
+
+CREATE FUNCTION bug5274_f1(p1 CHAR) RETURNS CHAR
+  RETURN CONCAT(p1, p1)|
+
+CREATE FUNCTION bug5274_f2() RETURNS CHAR
+BEGIN
+  DECLARE v1 INT DEFAULT 0;
+  DECLARE v2 CHAR DEFAULT 'x';
+
+  WHILE v1 < 30 DO
+    SET v1 = v1 + 1;
+    SET v2 = bug5274_f1(v2);
+  END WHILE;
+
+  RETURN v2;
+END|
+ 
+SELECT bug5274_f2()|
+
+# Cleanup.
+
+DROP FUNCTION bug5274_f1|
+DROP FUNCTION bug5274_f2|
+
+
 ###
 --echo End of 5.0 tests.