bzr commit into mysql-6.0 branch (holyfoot:2826)

[Alexey Botchkov]

#At file:///home/hf/work/mysql_common/60-37949/

 2826 Alexey Botchkov	2008-09-30
      test result fixed
modified:
  mysql-test/r/sp-error.result

=== modified file 'mysql-test/r/sp-error.result'
--- a/mysql-test/r/sp-error.result	2008-09-30 06:05:34 +0000
+++ b/mysql-test/r/sp-error.result	2008-09-30 10:10:32 +0000
@@ -1612,6 +1612,13 @@ end loop label1;
 end loop;
 end|
 ERROR 42000: End-label label1 without match
+CREATE TABLE t1 (a INT)|
+INSERT INTO t1 VALUES (1),(2)|
+CREATE PROCEDURE p1(a INT) BEGIN END|
+CALL p1((SELECT * FROM t1))|
+ERROR 21000: Subquery returns more than 1 row
+DROP PROCEDURE IF EXISTS p1|
+DROP TABLE t1|
 drop procedure if exists proc_8759;
 create procedure proc_8759()
 begin