Commit 1031c460 authored by unknown's avatar unknown
Browse files

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

into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg23651


sql/item_func.cc:
  Auto merged
parents 383fbde5 fc83f787

mysql-test/r/trigger.result

+15 −0
Original line number Diff line number Diff line
@@ -1241,4 +1241,19 @@ i j 
2	2

13	13

drop table t1;

drop table if exists t1;

drop function if exists f1;

create table t1 (i int);

create function f1() returns int return 10;

create trigger t1_bi before insert on t1 for each row set @a:= f1() + 10;

insert into t1 values ();

select @a;

@a

20

insert into t1 values ();

select @a;

@a

20

drop table t1;

drop function f1;

End of 5.0 tests

mysql-test/t/trigger.test

+20 −0
Original line number Diff line number Diff line
@@ -1499,4 +1499,24 @@ select * from t1; 
drop table t1;





#

# Bug #23651 "Server crashes when trigger which uses stored function

#             invoked from different connections".

#

--disable_warnings

drop table if exists t1;

drop function if exists f1;

--enable_warnings

create table t1 (i int);

create function f1() returns int return 10;

create trigger t1_bi before insert on t1 for each row set @a:= f1() + 10;

insert into t1 values ();

select @a;

connection addconroot1;

insert into t1 values ();

select @a;

connection default;

drop table t1;

drop function f1;



--echo End of 5.0 tests

sql/item_func.cc

+1 −0
Original line number Diff line number Diff line
@@ -4858,6 +4858,7 @@ Item_func_sp::cleanup() 
    result_field= NULL;

  }

  m_sp= NULL;

  dummy_table->s= NULL;

  Item_func::cleanup();

}