diff options
| author | Mats Kindahl <mats@sun.com> | 2008-10-23 21:27:09 +0200 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2008-10-23 21:27:09 +0200 |
| commit | 32c161f3ea7314051090fb02eca03ef347394010 (patch) | |
| tree | 09212d65be943c6c5dfd6d6a834841683d81f9f8 /mysql-test/r/sp-error.result | |
| parent | 3be6d967c5d04fa6dbeab1c25f28673d3abf8433 (diff) | |
| parent | e291aab7da9587f742291e7cc5e10e568846066e (diff) | |
| download | mariadb-git-32c161f3ea7314051090fb02eca03ef347394010.tar.gz | |
Merging 5.1 main into 5.1-rpl
Diffstat (limited to 'mysql-test/r/sp-error.result')
| -rw-r--r-- | mysql-test/r/sp-error.result | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result index cbb7cc706af..3def6536897 100644 --- a/mysql-test/r/sp-error.result +++ b/mysql-test/r/sp-error.result @@ -1629,6 +1629,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 p1; create procedure p1() begin |