bzr push into mysql-6.0 branch (holyfoot:2825)

[Alexey Botchkov]

 2825 Alexey Botchkov	2008-09-30 [merge]
      merging
modified:
  mysql-test/t/sp-error.test

=== modified file 'mysql-test/t/sp-error.test'
--- a/mysql-test/t/sp-error.test	2008-08-22 11:16:08 +0000
+++ b/mysql-test/t/sp-error.test	2008-09-30 06:05:34 +0000
@@ -2345,6 +2345,14 @@ begin
     end loop;
 end|
 
+CREATE TABLE t1 (a INT)|
+INSERT INTO t1 VALUES (1),(2)|
+CREATE PROCEDURE p1(a INT) BEGIN END|
+--error ER_SUBQUERY_NO_1_ROW
+CALL p1((SELECT * FROM t1))|
+DROP PROCEDURE IF EXISTS p1|
+DROP TABLE t1|
+
 delimiter ;|
 
 #