Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base

into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged

mysql-test/r/sp.result

@@ -6068,6 +6068,56 @@ select bug20777(18446744073709551613)+1;
 bug20777(18446744073709551613)+1
 18446744073709551614
 drop function bug20777;
+DROP FUNCTION IF EXISTS bug5274_f1|
+DROP FUNCTION IF EXISTS bug5274_f2|
+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()|
+bug5274_f2()
+x
+Warnings:
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+Warning	1265	Data truncated for column 'bug5274_f1' at row 1
+DROP FUNCTION bug5274_f1|
+DROP FUNCTION bug5274_f2|
 End of 5.0 tests.
 drop table t1,t2;
 CREATE TABLE t1 (a int auto_increment primary key) engine=MyISAM;

mysql-test/t/sp.test

@@ -7017,6 +7017,44 @@ select bug20777(18446744073709551613)+1;
 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.