Commit d8aad85f authored by dlenev@mockturtle.local's avatar dlenev@mockturtle.local

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

into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
parents f5d20770 6fd6e099
Branches unavailable
Tags unavailable
No related merge requests found
...@@ -1241,4 +1241,19 @@ i j ...@@ -1241,4 +1241,19 @@ i j
2 2 2 2
13 13 13 13
drop table t1; 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 End of 5.0 tests
...@@ -1499,4 +1499,24 @@ select * from t1; ...@@ -1499,4 +1499,24 @@ select * from t1;
drop table 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 --echo End of 5.0 tests
...@@ -4852,6 +4852,7 @@ Item_func_sp::cleanup() ...@@ -4852,6 +4852,7 @@ Item_func_sp::cleanup()
result_field= NULL; result_field= NULL;
} }
m_sp= NULL; m_sp= NULL;
dummy_table->s= NULL;
Item_func::cleanup(); Item_func::cleanup();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment