Commit 164ce4c5 authored by unknown's avatar unknown
Browse files

Recursion support made for SP (BUG#10100). 


client/mysqltest.c:
  An expected error messages hiding from the log if disable_result_log is in force.
mysql-test/r/sp-dynamic.result:
  The test expanded for case of allowed/disalowed recursion.
mysql-test/r/sp-error.result:
  Error messages changed.
  Test of bug11394() made with allowed recursion.
mysql-test/r/sp.result:
  Tests for recursion.
mysql-test/r/trigger.result:
  Check that triggers are not affected by this patch.
mysql-test/r/variables.result:
  Test of max_sp_recursion_depth variable.
mysql-test/t/sp-dynamic.test:
  The test expanded for case of allowed/disalowed recursion.
mysql-test/t/sp-error.test:
  Error messages changed.
  Test of bug11394() made with allowed recursion.
mysql-test/t/sp.test:
  Tests for recursion.
mysql-test/t/trigger.test:
  Check that triggers are not affected by this patch.
mysql-test/t/variables.test:
  Test of max_sp_recursion_depth variable.
sql/item_func.cc:
  sp_find_function() and sp_find_procedure() joined to sp_find_routine()
    function as it was mentioned in TODO.
sql/mysqld.cc:
  max_sp_recursion_depth variable added.
sql/set_var.cc:
  max_sp_recursion_depth variable added.
sql/share/errmsg.txt:
  An error message changed.
  An error message added.
sql/sp.cc:
  sp_find_function() and sp_find_procedure() joined to sp_find_routine()
    function as it was mentioned in TODO.
  Temory LEX is allocated on a stack, not on a heap.
  Recursion support added for stored procedures.
sql/sp.h:
  sp_find_function() and sp_find_procedure() joined to sp_find_routine()
    function as it was mentioned in TODO.
sql/sp_head.cc:
  Initialization of new sp_head fields to get correct list of instances
    contained one instance only.
  Stack requirement for SP instruction is increased.
  Stack free space is checked before mem root initialisation to avoid
    memory leak.
  Pointer to the free instance management added before and after
    SP execution.
sql/sp_head.h:
  New sp_head variables added to support inst of instances of SP
    for recursion and pointer on ths first free to use instance.
sql/sql_base.cc:
  open_table() consume a lot of stack space so we check free stack space before it.
sql/sql_class.h:
  max_sp_recursion_depth variable added.
sql/sql_parse.cc:
  sp_find_function() and sp_find_procedure() joined to sp_find_routine()
    function as it was mentioned in TODO.
parent a94df686

client/mysqltest.c

+23 −17
Original line number Diff line number Diff line
@@ -3313,6 +3313,8 @@ static int handle_error(const char *query, struct st_query *q, 
         (q->expected_errno[i].code.errnum == err_errno)) ||

        ((q->expected_errno[i].type == ERR_SQLSTATE) &&

         (strcmp(q->expected_errno[i].code.sqlstate, err_sqlstate) == 0)))

    {

      if (!disable_result_log)

      {

        if (q->expected_errors == 1)

        {
@@ -3328,6 +3330,7 @@ static int handle_error(const char *query, struct st_query *q, 
                 (q->expected_errno[0].type == ERR_ERRNO &&

                  q->expected_errno[0].code.errnum != 0))

          dynstr_append(ds,"Got one of the listed errors\n");

      }

      /* OK */

      DBUG_RETURN(0);

    }
@@ -3335,11 +3338,14 @@ static int handle_error(const char *query, struct st_query *q, 


  DBUG_PRINT("info",("i: %d  expected_errors: %d", i, q->expected_errors));



  if (!disable_result_log)

  {

    dynstr_append_mem(ds, "ERROR ",6);

    replace_dynstr_append(ds, err_sqlstate);

    dynstr_append_mem(ds, ": ", 2);

    replace_dynstr_append(ds, err_error);

    dynstr_append_mem(ds, "\n", 1);

  }



  if (i)

  {

mysql-test/r/sp-dynamic.result

+12 −3
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ begin 
execute stmt;

end|

prepare stmt from "call p1()"|

set @SAVE_SP_RECURSION_LEVELS=@@max_sp_recursion_depth|

set @@max_sp_recursion_depth=100|

execute stmt|

ERROR HY000: The prepared statement contains a stored routine call that refers to that same statement. It's not allowed to execute a prepared statement in such a recursive manner

execute stmt|
@@ -40,11 +42,18 @@ ERROR HY000: The prepared statement contains a stored routine call that refers t 
execute stmt|

ERROR HY000: The prepared statement contains a stored routine call that refers to that same statement. It's not allowed to execute a prepared statement in such a recursive manner

call p1()|

ERROR HY000: Recursive stored routines are not allowed.

ERROR HY000: The prepared statement contains a stored routine call that refers to that same statement. It's not allowed to execute a prepared statement in such a recursive manner

call p1()|

ERROR HY000: The prepared statement contains a stored routine call that refers to that same statement. It's not allowed to execute a prepared statement in such a recursive manner

call p1()|

ERROR HY000: The prepared statement contains a stored routine call that refers to that same statement. It's not allowed to execute a prepared statement in such a recursive manner

set @@max_sp_recursion_depth=@SAVE_SP_RECURSION_LEVELS|

call p1()|

ERROR HY000: Recursive limit 0 (as set by the max_sp_recursion_depth variable) was exceeded for routine p1

call p1()|

ERROR HY000: Recursive stored routines are not allowed.

ERROR HY000: Recursive limit 0 (as set by the max_sp_recursion_depth variable) was exceeded for routine p1

call p1()|

ERROR HY000: Recursive stored routines are not allowed.

ERROR HY000: Recursive limit 0 (as set by the max_sp_recursion_depth variable) was exceeded for routine p1

drop procedure p1|

create procedure p1()

begin

mysql-test/r/sp-error.result

+6 −3
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ return (i in (100, 200, bug11394(i-1), 400)); 
end if;

end|

select bug11394(2)|

ERROR HY000: Recursive stored routines are not allowed.

ERROR HY000: Recursive stored functions and triggers are not allowed.

drop function bug11394|

create function bug11394_1(i int) returns int

begin
@@ -719,7 +719,7 @@ return (select bug11394_1(i-1)); 
end if;

end|

select bug11394_1(2)|

ERROR HY000: Recursive stored routines are not allowed.

ERROR HY000: Recursive stored functions and triggers are not allowed.

drop function bug11394_1|

create function bug11394_2(i int) returns int return i|

select bug11394_2(bug11394_2(10))|
@@ -733,7 +733,10 @@ call bug11394(i - 1,(select 1)); 
end if;

end|

call bug11394(2, 1)|

ERROR HY000: Recursive stored routines are not allowed.

ERROR HY000: Recursive limit 0 (as set by the max_sp_recursion_depth variable) was exceeded for routine bug11394

set @@max_sp_recursion_depth=10|

call bug11394(2, 1)|

set @@max_sp_recursion_depth=default|

drop procedure bug11394|

CREATE PROCEDURE BUG_12490() HELP CONTENTS;

ERROR 0A000: HELP is not allowed in stored procedures

mysql-test/r/sp.result

+185 −0
Original line number Diff line number Diff line
@@ -3617,4 +3617,189 @@ count(*) 
drop table t3, t4|

drop procedure bug14210|

set @@session.max_heap_table_size=default|

drop function if exists bug10100f|

drop procedure if exists bug10100p|

drop procedure if exists bug10100t|

drop procedure if exists bug10100pt|

drop procedure if exists bug10100pv|

drop procedure if exists bug10100pd|

drop procedure if exists bug10100pc|

create function bug10100f(prm int) returns int

begin

if prm > 1 then

return prm * bug10100f(prm - 1);

end if;

return 1;

end|

create procedure bug10100p(prm int, inout res int)

begin

set res = res * prm;

if prm > 1 then

call bug10100p(prm - 1, res);  

end if;

end|

create procedure bug10100t(prm int)

begin

declare res int;

set res = 1;

call bug10100p(prm, res);

select res;

end|

create table t3 (a int)|

insert into t3 values (0)|

create view v1 as select a from t3;

create procedure bug10100pt(level int, lim int)

begin

if level < lim then

update t3 set a=level;

FLUSH TABLES;

call bug10100pt(level+1, lim);

else

select * from t3;

end if;

end|

create procedure bug10100pv(level int, lim int)

begin

if level < lim then

update v1 set a=level;

FLUSH TABLES;

call bug10100pv(level+1, lim);

else

select * from v1;

end if;

end|

prepare stmt2 from "select * from t3;";

create procedure bug10100pd(level int, lim int)

begin

if level < lim then

select level;

prepare stmt1 from "update t3 set a=a+2";

execute stmt1;

FLUSH TABLES;

execute stmt1;

FLUSH TABLES;

execute stmt1;

FLUSH TABLES;

deallocate prepare stmt1;

execute stmt2;

select * from t3;

call bug10100pd(level+1, lim);

else

execute stmt2;

end if;

end|

create procedure bug10100pc(level int, lim int)

begin

declare lv int;

declare c cursor for select a from t3;

open c;

if level < lim then

select level;

fetch c into lv;

select lv;

update t3 set a=level+lv;

FLUSH TABLES;

call bug10100pc(level+1, lim);

else

select * from t3;

end if;

close c;

end|

set @@max_sp_recursion_depth=4|

select @@max_sp_recursion_depth|

@@max_sp_recursion_depth

4

select bug10100f(3)|

ERROR HY000: Recursive stored functions and triggers are not allowed.

select bug10100f(6)|

ERROR HY000: Recursive stored functions and triggers are not allowed.

call bug10100t(5)|

res

120

call bug10100pt(1,5)|

a

4

call bug10100pv(1,5)|

a

4

update t3 set a=1|

call bug10100pd(1,5)|

level

1

a

7

a

7

level

2

a

13

a

13

level

3

a

19

a

19

level

4

a

25

a

25

a

25

select * from t3|

a

25

update t3 set a=1|

call bug10100pc(1,5)|

level

1

lv

1

level

2

lv

2

level

3

lv

4

level

4

lv

7

a

11

select * from t3|

a

11

set @@max_sp_recursion_depth=0|

select @@max_sp_recursion_depth|

@@max_sp_recursion_depth

0

select bug10100f(5)|

ERROR HY000: Recursive stored functions and triggers are not allowed.

call bug10100t(5)|

ERROR HY000: Recursive limit 0 (as set by the max_sp_recursion_depth variable) was exceeded for routine bug10100p

set @@max_sp_recursion_depth=255|

set @var=1|

call bug10100p(255, @var)|

call bug10100pt(1,255)|

call bug10100pv(1,255)|

call bug10100pd(1,255)|

call bug10100pc(1,255)|

set @@max_sp_recursion_depth=0|

deallocate prepare stmt2|

drop function bug10100f|

drop procedure bug10100p|

drop procedure bug10100t|

drop procedure bug10100pt|

drop procedure bug10100pv|

drop procedure bug10100pd|

drop procedure bug10100pc|

drop view v1|

drop table t3|

drop table t1,t2;

mysql-test/r/trigger.result

+3 −0
Original line number Diff line number Diff line
@@ -703,8 +703,11 @@ create trigger t1_ai after insert on t1 
for each row insert into t2 values (new.f1+1);

create trigger t2_ai after insert on t2

for each row insert into t1 values (new.f2+1);

set @SAVE_SP_RECURSION_LEVELS=@@max_sp_recursion_depth;

set @@max_sp_recursion_depth=100;

insert into t1 values (1);

ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.

set @@max_sp_recursion_depth=@SAVE_SP_RECURSION_LEVELS;

select * from t1;

f1

1