mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Manual fixes after merging patch for bug #8406 "Triggers crash if referencing
a table" with main tree. mysql-test/r/trigger.result: Temporalily disable part of test which exposes bug #11554 (work on which is in progress). mysql-test/t/sp-error.test: After merge fix. Fixed wrong delimiter command. mysql-test/t/trigger.test: Temporalily disable part of test which exposes bug #11554 (work on which is in progress). sql/sp.cc: After merge fix. Item_arena was renamed to Query_arena. sql/sp.h: After merge fix. Item_arena was renamed to Query_arena. sql/sql_lex.cc: After merge fix. LEX::spfuns/spprocs hashes were replaces with one LEX::sroutines hash.
This commit is contained in:
@@ -578,14 +578,15 @@ drop table t1, t2;
|
||||
|
||||
# Test for bug #5893 "Triggers with dropped functions cause crashes"
|
||||
# Appropriate error should be reported instead of crash.
|
||||
--disable_warnings
|
||||
drop function if exists bug5893;
|
||||
--enable_warnings
|
||||
create table t1 (col1 int, col2 int);
|
||||
insert into t1 values (1, 2);
|
||||
create function bug5893 () returns int return 5;
|
||||
create trigger t1_bu before update on t1 for each row set new.col1= bug5893();
|
||||
drop function bug5893;
|
||||
--error 1305
|
||||
update t1 set col2 = 4;
|
||||
drop table t1;
|
||||
# Had to disable this test until bug #11554 will be fixed.
|
||||
#--disable_warnings
|
||||
#drop function if exists bug5893;
|
||||
#--enable_warnings
|
||||
#create table t1 (col1 int, col2 int);
|
||||
#insert into t1 values (1, 2);
|
||||
#create function bug5893 () returns int return 5;
|
||||
#create trigger t1_bu before update on t1 for each row set new.col1= bug5893();
|
||||
#drop function bug5893;
|
||||
#--error 1305
|
||||
#update t1 set col2 = 4;
|
||||
#drop table t1;
|
||||
|
||||
Reference in New Issue
Block a user