2006-03-24 12:58:18 +01:00
|
|
|
drop table if exists t1;
|
|
|
|
create table t1 (a varchar(16), b int) engine=innodb;
|
|
|
|
create trigger t1_bi before insert on t1 for each row
|
|
|
|
begin
|
|
|
|
set new.a := upper(new.a);
|
|
|
|
set new.b := new.b + 3;
|
|
|
|
end|
|
|
|
|
select trigger_schema, trigger_name, event_object_schema,
|
|
|
|
event_object_table, action_statement from information_schema.triggers
|
|
|
|
where event_object_schema = 'test' and event_object_table = 't1';
|
|
|
|
trigger_schema trigger_name event_object_schema event_object_table action_statement
|
|
|
|
test t1_bi test t1 begin
|
|
|
|
set new.a := upper(new.a);
|
|
|
|
set new.b := new.b + 3;
|
|
|
|
end
|
|
|
|
insert into t1 values ('The Lion', 10);
|
|
|
|
select * from t1;
|
|
|
|
a b
|
|
|
|
THE LION 13
|
|
|
|
optimize table t1;
|
|
|
|
Table Op Msg_type Msg_text
|
|
|
|
test.t1 optimize status OK
|
|
|
|
select trigger_schema, trigger_name, event_object_schema,
|
|
|
|
event_object_table, action_statement from information_schema.triggers
|
|
|
|
where event_object_schema = 'test' and event_object_table = 't1';
|
|
|
|
trigger_schema trigger_name event_object_schema event_object_table action_statement
|
|
|
|
test t1_bi test t1 begin
|
|
|
|
set new.a := upper(new.a);
|
|
|
|
set new.b := new.b + 3;
|
|
|
|
end
|
|
|
|
insert into t1 values ('The Unicorn', 20);
|
|
|
|
select * from t1;
|
|
|
|
a b
|
|
|
|
THE LION 13
|
|
|
|
THE UNICORN 23
|
|
|
|
alter table t1 add column c int default 0;
|
|
|
|
select trigger_schema, trigger_name, event_object_schema,
|
|
|
|
event_object_table, action_statement from information_schema.triggers
|
|
|
|
where event_object_schema = 'test' and event_object_table = 't1';
|
|
|
|
trigger_schema trigger_name event_object_schema event_object_table action_statement
|
|
|
|
test t1_bi test t1 begin
|
|
|
|
set new.a := upper(new.a);
|
|
|
|
set new.b := new.b + 3;
|
|
|
|
end
|
|
|
|
insert into t1 values ('Alice', 30, 1);
|
|
|
|
select * from t1;
|
|
|
|
a b c
|
|
|
|
THE LION 13 0
|
|
|
|
THE UNICORN 23 0
|
|
|
|
ALICE 33 1
|
|
|
|
alter table t1 rename to t1;
|
|
|
|
select trigger_schema, trigger_name, event_object_schema,
|
|
|
|
event_object_table, action_statement from information_schema.triggers
|
|
|
|
where event_object_schema = 'test' and event_object_table = 't1';
|
|
|
|
trigger_schema trigger_name event_object_schema event_object_table action_statement
|
|
|
|
test t1_bi test t1 begin
|
|
|
|
set new.a := upper(new.a);
|
|
|
|
set new.b := new.b + 3;
|
|
|
|
end
|
|
|
|
insert into t1 values ('The Crown', 40, 1);
|
|
|
|
select * from t1;
|
|
|
|
a b c
|
|
|
|
THE LION 13 0
|
|
|
|
THE UNICORN 23 0
|
|
|
|
ALICE 33 1
|
|
|
|
THE CROWN 43 1
|
|
|
|
alter table t1 rename to t1, add column d int default 0;
|
|
|
|
select trigger_schema, trigger_name, event_object_schema,
|
|
|
|
event_object_table, action_statement from information_schema.triggers
|
|
|
|
where event_object_schema = 'test' and event_object_table = 't1';
|
|
|
|
trigger_schema trigger_name event_object_schema event_object_table action_statement
|
|
|
|
test t1_bi test t1 begin
|
|
|
|
set new.a := upper(new.a);
|
|
|
|
set new.b := new.b + 3;
|
|
|
|
end
|
|
|
|
insert into t1 values ('The Pie', 50, 1, 1);
|
|
|
|
select * from t1;
|
|
|
|
a b c d
|
|
|
|
THE LION 13 0 0
|
|
|
|
THE UNICORN 23 0 0
|
|
|
|
ALICE 33 1 0
|
|
|
|
THE CROWN 43 1 0
|
|
|
|
THE PIE 53 1 1
|
|
|
|
drop table t1;
|
A fix and a test case for Bug#26141 mixing table types in trigger
causes full table lock on innodb table.
Also fixes Bug#28502 Triggers that update another innodb table
will block on X lock unnecessarily (duplciate).
Code review fixes.
Both bugs' synopses are misleading: InnoDB table is
not X locked. The statements, however, cannot proceed concurrently,
but this happens due to lock conflicts for tables used in triggers,
not for the InnoDB table.
If a user had an InnoDB table, and two triggers, AFTER UPDATE and
AFTER INSERT, competing for different resources (e.g. two distinct
MyISAM tables), then these two triggers would not be able to execute
concurrently. Moreover, INSERTS/UPDATES of the InnoDB table would
not be able to run concurrently.
The problem had other side-effects (see respective bug reports).
This behavior was a consequence of a shortcoming of the pre-locking
algorithm, which would not distinguish between different DML operations
(e.g. INSERT and DELETE) and pre-lock all the tables
that are used by any trigger defined on the subject table.
The idea of the fix is to extend the pre-locking algorithm to keep track,
for each table, what DML operation it is used for and not
load triggers that are known to never be fired.
mysql-test/r/trigger-trans.result:
Update results (Bug#26141)
mysql-test/r/trigger.result:
Update results (Bug#28502)
mysql-test/t/trigger-trans.test:
Add a test case for Bug#26141 mixing table types in trigger causes
full table lock on innodb table.
mysql-test/t/trigger.test:
Add a test case for Bug#28502 Triggers that update another innodb
table will block echo on X lock unnecessarily. Add more test
coverage for triggers.
sql/item.h:
enum trg_event_type is needed in table.h
sql/sp.cc:
Take into account table_list->trg_event_map when determining
what tables to pre-lock.
After this change, if we attempt to fire a
trigger for which we had not pre-locked any tables, error
'Table was not locked with LOCK TABLES' will be printed.
This, however, should never happen, provided the pre-locking
algorithm has no programming bugs.
Previously a trigger key in the sroutines hash was based on the name
of the table the trigger belongs to. This was possible because we would
always add to the pre-locking list all the triggers defined for a table when
handling this table.
Now the key is based on the name of the trigger, owing
to the fact that a trigger name must be unique in the database it
belongs to.
sql/sp_head.cc:
Generate sroutines hash key in init_spname(). This is a convenient
place since there we have all the necessary information and can
avoid an extra alloc.
Maintain and merge trg_event_map when adding and merging elements
of the pre-locking list.
sql/sp_head.h:
Add ,m_sroutines_key member, used when inserting the sphead for a
trigger into the cache of routines used by a statement.
Previously the key was based on the table name the trigger belonged
to, since for a given table we would add to the sroutines list
all the triggers defined on it.
sql/sql_lex.cc:
Introduce a new lex step: set_trg_event_type_for_tables().
It is called when we have finished parsing but before opening
and locking tables. Now this step is used to evaluate for each
TABLE_LIST instance which INSERT/UPDATE/DELETE operation, if any,
it is used in.
In future this method could be extended to aggregate other information
that is hard to aggregate during parsing.
sql/sql_lex.h:
Add declaration for set_trg_event_type_for_tables().
sql/sql_parse.cc:
Call set_trg_event_type_for_tables() after MYSQLparse(). Remove tabs.
sql/sql_prepare.cc:
Call set_trg_event_type_for_tables() after MYSQLparse().
sql/sql_trigger.cc:
Call set_trg_event_type_for_tables() after MYSQLparse().
sql/sql_trigger.h:
Remove an obsolete member.
sql/sql_view.cc:
Call set_trg_event_type_for_tables() after MYSQLparse().
sql/sql_yacc.yy:
Move assignment of sp_head::m_type before calling sp_head::init_spname(),
one is now used inside another.
sql/table.cc:
Implement TABLE_LIST::set_trg_event_map() - a method that calculates
wh triggers may be fired on this table when executing a statement.
sql/table.h:
Add missing declarations.
Move declaration of trg_event_type from item.h (it will be needed for
trg_event_map bitmap when we start using Bitmap template instead
of uint8).
2007-07-12 20:26:41 +02:00
|
|
|
|
|
|
|
Bug#26141 mixing table types in trigger causes full
|
|
|
|
table lock on innodb table
|
|
|
|
|
|
|
|
Ensure we do not open and lock tables for the triggers we do not
|
|
|
|
fire.
|
|
|
|
|
|
|
|
drop table if exists t1, t2, t3;
|
|
|
|
drop trigger if exists trg_bug26141_au;
|
|
|
|
drop trigger if exists trg_bug26141_ai;
|
|
|
|
create table t1 (c int primary key) engine=innodb;
|
|
|
|
create table t2 (c int) engine=myisam;
|
|
|
|
create table t3 (c int) engine=myisam;
|
|
|
|
insert into t1 (c) values (1);
|
|
|
|
create trigger trg_bug26141_ai after insert on t1
|
|
|
|
for each row
|
|
|
|
begin
|
|
|
|
insert into t2 (c) values (1);
|
|
|
|
# We need the 'sync' lock to synchronously wait in connection 2 till
|
|
|
|
# the moment when the trigger acquired all the locks.
|
|
|
|
select release_lock("lock_bug26141_sync") into @a;
|
|
|
|
# 1000 is time in seconds of lock wait timeout -- this is a way
|
|
|
|
# to cause a manageable sleep up to 1000 seconds
|
|
|
|
select get_lock("lock_bug26141_wait", 1000) into @a;
|
|
|
|
end|
|
|
|
|
create trigger trg_bug26141_au after update on t1
|
|
|
|
for each row
|
|
|
|
begin
|
|
|
|
insert into t3 (c) values (1);
|
|
|
|
end|
|
|
|
|
select get_lock("lock_bug26141_wait", 0);
|
|
|
|
get_lock("lock_bug26141_wait", 0)
|
|
|
|
1
|
|
|
|
select get_lock("lock_bug26141_sync", /* must not be priorly locked */ 0);
|
|
|
|
get_lock("lock_bug26141_sync", /* must not be priorly locked */ 0)
|
|
|
|
1
|
|
|
|
insert into t1 (c) values (2);
|
|
|
|
select get_lock("lock_bug26141_sync", 1000);
|
|
|
|
get_lock("lock_bug26141_sync", 1000)
|
|
|
|
1
|
|
|
|
update t1 set c=3 where c=1;
|
|
|
|
select release_lock("lock_bug26141_sync");
|
|
|
|
release_lock("lock_bug26141_sync")
|
|
|
|
1
|
|
|
|
select release_lock("lock_bug26141_wait");
|
|
|
|
release_lock("lock_bug26141_wait")
|
|
|
|
1
|
|
|
|
select * from t1;
|
|
|
|
c
|
|
|
|
2
|
|
|
|
3
|
|
|
|
select * from t2;
|
|
|
|
c
|
|
|
|
1
|
|
|
|
select * from t3;
|
|
|
|
c
|
|
|
|
1
|
|
|
|
drop table t1, t2, t3;
|
|
|
|
End of 5.0 tests
|