Commit 6658fb34 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/dlenev/src/mysql-5.0-bg11896


mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sql_base.cc:
  Auto merged
mysql-test/r/trigger.result:
  Manual merge.
sql/share/errmsg.txt:
  Manual merge.
parents 4be08544 b1921c85

mysql-test/r/sp-error.result

+30 −0
Original line number Diff line number Diff line
@@ -299,6 +299,36 @@ lock tables t1 read, mysql.proc read| 
unlock tables|

lock tables mysql.proc write|

unlock tables|

drop function if exists f1|

create function f1(i int) returns int

begin

insert into t1 (val) values (i);

return 0;

end|

select val, f1(val) from t1|

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

select val, f1(val) from t1 as tab|

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

select * from t1|

val	x

42	3.1

19	1.2

update t1 set val= f1(val)|

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

select * from t1|

val	x

42	3.1

19	1.2

select f1(17)|

f1(17)

0

select * from t1|

val	x

42	3.1

19	1.2

17	NULL

delete from t1 where val= 17|

drop function f1|

create procedure bug1965()

begin

declare c cursor for select val from t1 order by valname;

mysql-test/r/trigger.result

+41 −0
Original line number Diff line number Diff line
@@ -697,3 +697,44 @@ c1 c2 
3	NULL

drop procedure bug11587;

drop table t1;

create table t1 (f1 integer);

create table t2 (f2 integer);

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);

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.

select * from t1;

f1

1

select * from t2;

f2

2

drop trigger t1_ai;

drop trigger t2_ai;

create trigger t1_bu before update on t1

for each row insert into t1 values (2);

update t1 set f1= 10;

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

select * from t1;

f1

1

drop trigger t1_bu;

create trigger t1_bu before update on t1

for each row delete from t1 where f1=new.f1;

update t1 set f1= 10;

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

select * from t1;

f1

1

drop trigger t1_bu;

create trigger t1_bi before insert on t1

for each row set new.f1=(select sum(f1) from t1);

insert into t1 values (3);

select * from t1;

f1

1

1

drop trigger t1_bi;

drop tables t1, t2;

mysql-test/t/sp-error.test

+29 −0
Original line number Diff line number Diff line
@@ -409,6 +409,35 @@ lock tables mysql.proc write| 
unlock tables|





#

# Check that in functions we don't allow to update tables which

# are used by statements which invoke these functions.

#

--disable_warnings

drop function if exists f1|

--enable_warnings

create function f1(i int) returns int

begin

  insert into t1 (val) values (i);

  return 0;

end|

--error ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG

select val, f1(val) from t1|

# Table alias should not matter

--error ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG

select val, f1(val) from t1 as tab|

select * from t1|

--error ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG

update t1 set val= f1(val)|

select * from t1|

# But this should be OK

select f1(17)|

select * from t1|

# Cleanup

delete from t1 where val= 17|

drop function f1|





#

# BUG#1965

#

mysql-test/t/trigger.test

+36 −0
Original line number Diff line number Diff line
@@ -729,3 +729,39 @@ select * from t1; 


drop procedure bug11587;

drop table t1;



# Test for bug #11896 "Partial locking in case of recursive trigger

# definitions". Recursion in triggers should not be allowed.

# We also should not allow to change tables which are used in

# statements invoking this trigger.

create table t1 (f1 integer);

create table t2 (f2 integer);

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);

--error ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG

insert into t1 values (1);

select * from t1;

select * from t2;

drop trigger t1_ai;

drop trigger t2_ai;

create trigger t1_bu before update on t1

  for each row insert into t1 values (2);

--error ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG

update t1 set f1= 10;

select * from t1;

drop trigger t1_bu;

create trigger t1_bu before update on t1

  for each row delete from t1 where f1=new.f1;

--error ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG

update t1 set f1= 10;

select * from t1;

drop trigger t1_bu;

# This should work tough

create trigger t1_bi before insert on t1

  for each row set new.f1=(select sum(f1) from t1);

insert into t1 values (3);

select * from t1;

drop trigger t1_bi;

drop tables t1, t2;

sql/share/errmsg.txt

+2 −0
Original line number Diff line number Diff line
@@ -5397,3 +5397,5 @@ ER_XAER_DUPID XAE08 
        eng "XAER_DUPID: The XID already exists"

ER_DATETIME_FUNCTION_OVERFLOW 22008

        eng "Datetime function: %-.32s field overflow"

ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG

        eng "Can't update table '%-.64s' in stored function/trigger because it is already used by statement which invoked this stored function/trigger."