Commit 3bf44a86 authored by Alexey Botchkov's avatar Alexey Botchkov
Browse files

merging

parents 4223fa0e b6f4b1c0

mysql-test/r/sp-error.result

+7 −0
Original line number Diff line number Diff line
@@ -1628,6 +1628,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

mysql-test/t/sp-error.test

+8 −0
Original line number Diff line number Diff line
@@ -2362,6 +2362,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 ;|



#

sql/sp_head.cc

+5 −1
Original line number Diff line number Diff line
@@ -1940,7 +1940,11 @@ sp_head::execute_procedure(THD *thd, List<Item> *args) 
      we'll leave it here.

    */

    if (!thd->in_sub_stmt)

    {

      thd->lex->unit.cleanup();

      close_thread_tables(thd);            

      thd->rollback_item_tree_changes();

    }



    DBUG_PRINT("info",(" %.*s: eval args done",

                       (int) m_name.length, m_name.str));