Commit 896786ea authored by unknown's avatar unknown
Browse files

Manual merge of patch fixing several trigger related bugs with main tree. 


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Manual merge
sql/sql_update.cc:
  Manual merge
parents 8ddb0ddc 1fa7c69d

mysql-test/r/trigger.result

+109 −0
Original line number Diff line number Diff line
@@ -140,6 +140,48 @@ drop trigger t1.trg1; 
drop trigger t1.trg2;

drop trigger t1.trg3;

drop table t1;

create table t1 (id int not null primary key, data int);

create trigger t1_bi before insert on t1 for each row

set @log:= concat(@log, "(BEFORE_INSERT: new=(id=", new.id, ", data=", new.data,"))");

create trigger t1_ai after insert on t1 for each row

set @log:= concat(@log, "(AFTER_INSERT: new=(id=", new.id, ", data=", new.data,"))");

create trigger t1_bu before update on t1 for each row

set @log:= concat(@log, "(BEFORE_UPDATE: old=(id=", old.id, ", data=", old.data,

") new=(id=", new.id, ", data=", new.data,"))");

create trigger t1_au after update on t1 for each row

set @log:= concat(@log, "(AFTER_UPDATE: old=(id=", old.id, ", data=", old.data,

") new=(id=", new.id, ", data=", new.data,"))");

create trigger t1_bd before delete on t1 for each row

set @log:= concat(@log, "(BEFORE_DELETE: old=(id=", old.id, ", data=", old.data,"))");

create trigger t1_ad after delete on t1 for each row

set @log:= concat(@log, "(AFTER_DELETE: old=(id=", old.id, ", data=", old.data,"))");

set @log:= "";

insert into t1 values (1, 1);

select @log;

@log

(BEFORE_INSERT: new=(id=1, data=1))(AFTER_INSERT: new=(id=1, data=1))

set @log:= "";

insert ignore t1 values (1, 2);

select @log;

@log

(BEFORE_INSERT: new=(id=1, data=2))

set @log:= "";

replace t1 values (1, 3), (2, 2);

select @log;

@log

(BEFORE_INSERT: new=(id=1, data=3))(BEFORE_UPDATE: old=(id=1, data=1) new=(id=1, data=3))(AFTER_UPDATE: old=(id=1, data=1) new=(id=1, data=3))(BEFORE_INSERT: new=(id=2, data=2))(AFTER_INSERT: new=(id=2, data=2))

alter table t1 add ts timestamp default now();

set @log:= "";

replace t1 (id, data) values (1, 4);

select @log;

@log

(BEFORE_INSERT: new=(id=1, data=4))(BEFORE_DELETE: old=(id=1, data=3))(AFTER_DELETE: old=(id=1, data=3))(AFTER_INSERT: new=(id=1, data=4))

set @log:= "";

insert into t1 (id, data) values (1, 5), (3, 3) on duplicate key update data= data + 2;

select @log;

@log

(BEFORE_INSERT: new=(id=1, data=5))(BEFORE_UPDATE: old=(id=1, data=4) new=(id=1, data=6))(AFTER_UPDATE: old=(id=1, data=4) new=(id=1, data=6))(BEFORE_INSERT: new=(id=3, data=3))(AFTER_INSERT: new=(id=3, data=3))

drop table t1;

create table t1 (i int);

create trigger trg before insert on t1 for each row set @a:= old.i;

ERROR HY000: There is no OLD row in on INSERT trigger
@@ -206,3 +248,70 @@ create table t1 (i int); 
create trigger trg1 before insert on t1 for each row set @a:= 1;

drop database mysqltest;

use test;

create table t1 (i int, j int default 10, k int not null, key (k));

create table t2 (i int);

insert into t1 (i, k) values (1, 1);

insert into t2 values (1);

create trigger trg1 before update on t1 for each row set @a:= @a + new.j - old.j;

create trigger trg2 after update on t1 for each row set @b:= "Fired";

set @a:= 0, @b:= "";

update t1, t2 set j = j + 10 where t1.i = t2.i;

select @a, @b;

@a	@b

10	Fired

insert into t1 values (2, 13, 2);

insert into t2 values (2);

set @a:= 0, @b:= "";

update t1, t2 set j = j + 15 where t1.i = t2.i and t1.k >= 2;

select @a, @b;

@a	@b

15	Fired

create trigger trg3 before delete on t1 for each row set @c:= @c + old.j;

create trigger trg4 before delete on t2 for each row set @d:= @d + old.i;

create trigger trg5 after delete on t1 for each row set @e:= "After delete t1 fired";

create trigger trg6 after delete on t2 for each row set @f:= "After delete t2 fired";

set @c:= 0, @d:= 0, @e:= "", @f:= "";

delete t1, t2 from t1, t2 where t1.i = t2.i;

select @c, @d, @e, @f;

@c	@d	@e	@f

48	3	After delete t1 fired	After delete t2 fired

drop table t1, t2;

create table t1 (i int, j int default 10)|

create table t2 (i int)|

insert into t2 values (1), (2)|

create trigger trg1 before insert on t1 for each row 

begin

if new.i = 1 then

set new.j := 1;

end if;

end|

create trigger trg2 after insert on t1 for each row set @a:= 1|

set @a:= 0|

insert into t1 (i) select * from t2|

select * from t1|

i	j

1	1

2	10

select @a|

@a

1

drop table t1, t2|

create table t1 (i int, j int, k int);

create trigger trg1 before insert on t1 for each row set new.k = new.i;

create trigger trg2 after insert on t1 for each row set @b:= "Fired";

set @b:="";

load data infile '../../std_data/rpl_loaddata.dat' into table t1 (@a, i);

select *, @b from t1;

i	j	k	@b

10	NULL	10	Fired

15	NULL	15	Fired

set @b:="";

load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, j);

select *, @b from t1;

i	j	k	@b

10	NULL	10	Fired

15	NULL	15	Fired

1	2	1	Fired

3	4	3	Fired

5	6	5	Fired

drop table t1;

mysql-test/t/trigger.test

+118 −0
Original line number Diff line number Diff line
@@ -150,6 +150,55 @@ drop trigger t1.trg3; 
drop table t1;





# Let us test how triggers work for special forms of INSERT such as

# REPLACE and INSERT ... ON DUPLICATE KEY UPDATE

create table t1 (id int not null primary key, data int);

create trigger t1_bi before insert on t1 for each row

  set @log:= concat(@log, "(BEFORE_INSERT: new=(id=", new.id, ", data=", new.data,"))");

create trigger t1_ai after insert on t1 for each row

  set @log:= concat(@log, "(AFTER_INSERT: new=(id=", new.id, ", data=", new.data,"))");

create trigger t1_bu before update on t1 for each row

  set @log:= concat(@log, "(BEFORE_UPDATE: old=(id=", old.id, ", data=", old.data,

                                        ") new=(id=", new.id, ", data=", new.data,"))");

create trigger t1_au after update on t1 for each row

  set @log:= concat(@log, "(AFTER_UPDATE: old=(id=", old.id, ", data=", old.data,

                                       ") new=(id=", new.id, ", data=", new.data,"))");

create trigger t1_bd before delete on t1 for each row

  set @log:= concat(@log, "(BEFORE_DELETE: old=(id=", old.id, ", data=", old.data,"))");

create trigger t1_ad after delete on t1 for each row

  set @log:= concat(@log, "(AFTER_DELETE: old=(id=", old.id, ", data=", old.data,"))");

# Simple INSERT - both triggers should be called

set @log:= "";

insert into t1 values (1, 1);

select @log;

# INSERT IGNORE for already existing key - only before trigger should fire

set @log:= "";

insert ignore t1 values (1, 2);

select @log;

# REPLACE: before insert trigger should be called for both records,

#          but then for first one update will be executed (and both update

#          triggers should fire). For second after insert trigger will be

#          called as for usual insert

set @log:= "";

replace t1 values (1, 3), (2, 2);

select @log;

# Now let us change table in such way that REPLACE on won't be executed

# using update.

alter table t1 add ts timestamp default now();

set @log:= "";

# This REPLACE should be executed via DELETE and INSERT so proper 

# triggers should be invoked.

replace t1 (id, data) values (1, 4);

select @log;

# Finally let us test INSERT ... ON DUPLICATE KEY UPDATE ...

set @log:= "";

insert into t1 (id, data) values (1, 5), (3, 3) on duplicate key update data= data + 2; 

select @log;



# This also drops associated triggers

drop table t1;





#

# Test of wrong column specifiers in triggers

#
@@ -249,3 +298,72 @@ create trigger trg1 before insert on t1 for each row set @a:= 1; 
# This should succeed

drop database mysqltest;

use test;



# Test for bug #5860 "Multi-table UPDATE does not activate update triggers"

# We will also test how delete triggers wor for multi-table DELETE.

create table t1 (i int, j int default 10, k int not null, key (k));

create table t2 (i int);

insert into t1 (i, k) values (1, 1);

insert into t2 values (1);

create trigger trg1 before update on t1 for each row set @a:= @a + new.j - old.j;

create trigger trg2 after update on t1 for each row set @b:= "Fired";

set @a:= 0, @b:= "";

# Check that trigger works in case of update on the fly

update t1, t2 set j = j + 10 where t1.i = t2.i;

select @a, @b;

insert into t1 values (2, 13, 2);

insert into t2 values (2);

set @a:= 0, @b:= "";

# And now let us check that triggers work in case of multi-update which

# is done through temporary tables...

update t1, t2 set j = j + 15 where t1.i = t2.i and t1.k >= 2;

select @a, @b;

# Let us test delete triggers for multi-delete now.

# We create triggers for both tables because we want test how they

# work in both on-the-fly and via-temp-tables cases.

create trigger trg3 before delete on t1 for each row set @c:= @c + old.j;

create trigger trg4 before delete on t2 for each row set @d:= @d + old.i;

create trigger trg5 after delete on t1 for each row set @e:= "After delete t1 fired";

create trigger trg6 after delete on t2 for each row set @f:= "After delete t2 fired";

set @c:= 0, @d:= 0, @e:= "", @f:= "";

delete t1, t2 from t1, t2 where t1.i = t2.i;

select @c, @d, @e, @f;

# This also will drop triggers

drop table t1, t2;



# Test for bug #6812 "Triggers are not activated for INSERT ... SELECT".

# (We also check the fact that trigger modifies some field does not affect

#  value of next record inserted).

delimiter |;

create table t1 (i int, j int default 10)|

create table t2 (i int)|

insert into t2 values (1), (2)|

create trigger trg1 before insert on t1 for each row 

begin

  if new.i = 1 then

    set new.j := 1;

  end if;

end|

create trigger trg2 after insert on t1 for each row set @a:= 1|

set @a:= 0|

insert into t1 (i) select * from t2|

select * from t1|

select @a|

# This also will drop triggers

drop table t1, t2|

delimiter ;|



# Test for bug #8755 "Trigger is not activated by LOAD DATA"

create table t1 (i int, j int, k int);

create trigger trg1 before insert on t1 for each row set new.k = new.i;

create trigger trg2 after insert on t1 for each row set @b:= "Fired"; 

set @b:="";

# Test triggers with file with separators

load data infile '../../std_data/rpl_loaddata.dat' into table t1 (@a, i);

select *, @b from t1;

set @b:="";

# Test triggers with fixed size row file

load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, j);

select *, @b from t1;

# This also will drop triggers

drop table t1;

sql/item.cc

+22 −21
Original line number Diff line number Diff line
@@ -4554,40 +4554,40 @@ void Item_insert_value::print(String *str) 




/*

  Bind item representing field of row being changed in trigger

  to appropriate Field object.

  Find index of Field object which will be appropriate for item

  representing field of row being changed in trigger.



  SYNOPSIS

    setup_field()

      thd   - current thread context

      table - table of trigger (and where we looking for fields)

      event - type of trigger event



  NOTE

    This function does almost the same as fix_fields() for Item_field

    but is invoked during trigger definition parsing and takes TABLE

    object as its argument. If proper field was not found in table

    error will be reported at fix_fields() time.

    but is invoked right after trigger definition parsing. Since at

    this stage we can't say exactly what Field object (corresponding

    to TABLE::record[0] or TABLE::record[1]) should be bound to this

    Item, we only find out index of the Field and then select concrete

    Field object in fix_fields() (by that time Table_trigger_list::old_field/

    new_field should point to proper array of Fields).

    It also binds Item_trigger_field to Table_triggers_list object for

    table of trigger which uses this item.

*/

void Item_trigger_field::setup_field(THD *thd, TABLE *table,

                                     enum trg_event_type event)



void Item_trigger_field::setup_field(THD *thd, TABLE *table)

{

  uint field_idx= (uint)-1;

  bool save_set_query_id= thd->set_query_id;



  /* TODO: Think more about consequences of this step. */

  thd->set_query_id= 0;



  if (find_field_in_real_table(thd, table, field_name,

                                     strlen(field_name), 0, 0,

                                     &field_idx))

  {

    field= (row_version == OLD_ROW && event == TRG_EVENT_UPDATE) ?

             table->triggers->old_field[field_idx] :

             table->field[field_idx];

  }



  /*

    Try to find field by its name and if it will be found

    set field_idx properly.

  */

  (void)find_field_in_real_table(thd, table, field_name, strlen(field_name),

                                 0, 0, &field_idx);

  thd->set_query_id= save_set_query_id;

  triggers= table->triggers;

}
@@ -4612,9 +4612,10 @@ bool Item_trigger_field::fix_fields(THD *thd, 
  */

  DBUG_ASSERT(fixed == 0);



  if (field)

  if (field_idx != (uint)-1)

  {

    // QQ: May be this should be moved to setup_field?

    field= (row_version == OLD_ROW) ? triggers->old_field[field_idx] :

                                      triggers->new_field[field_idx];

    set_field(field);

    fixed= 1;

    return 0;

sql/item.h

+14 −5
Original line number Diff line number Diff line
@@ -1632,13 +1632,18 @@ enum trg_event_type 
  TRG_EVENT_INSERT= 0 , TRG_EVENT_UPDATE= 1, TRG_EVENT_DELETE= 2

};



class Table_triggers_list;



/*

  Represents NEW/OLD version of field of row which is

  changed/read in trigger.



  Note: For this item actual binding to Field object happens not during

        fix_fields() (like for Item_field) but during parsing of trigger

        definition, when table is opened, with special setup_field() call.

  Note: For this item main part of actual binding to Field object happens

        not during fix_fields() call (like for Item_field) but right after

        parsing of trigger definition, when table is opened, with special

        setup_field() call. On fix_fields() stage we simply choose one of

        two Field instances representing either OLD or NEW version of this

        field.

*/

class Item_trigger_field : public Item_field

{
@@ -1648,13 +1653,17 @@ class Item_trigger_field : public Item_field 
  row_version_type row_version;

  /* Next in list of all Item_trigger_field's in trigger */

  Item_trigger_field *next_trg_field;

  /* Index of the field in the TABLE::field array */

  uint field_idx;

  /* Pointer to Table_trigger_list object for table of this trigger */

  Table_triggers_list *triggers;



  Item_trigger_field(row_version_type row_ver_par,

                     const char *field_name_par):

    Item_field((const char *)NULL, (const char *)NULL, field_name_par),

    row_version(row_ver_par)

    row_version(row_ver_par), field_idx((uint)-1)

  {}

  void setup_field(THD *thd, TABLE *table, enum trg_event_type event);

  void setup_field(THD *thd, TABLE *table);

  enum Type type() const { return TRIGGER_FIELD_ITEM; }

  bool eq(const Item *item, bool binary_cmp) const;

  bool fix_fields(THD *, struct st_table_list *, Item **);

sql/mysql_priv.h

+10 −2
Original line number Diff line number Diff line
@@ -924,10 +924,18 @@ bool remove_table_from_cache(THD *thd, const char *db, const char *table, 
			     bool return_if_owned_by_thd);

bool close_cached_tables(THD *thd, bool wait_for_refresh, TABLE_LIST *tables);

void copy_field_from_tmp_record(Field *field,int offset);

bool fill_record(THD *thd, List<Item> &fields, List<Item> &values,

                 bool ignore_errors);

bool fill_record(THD *thd, Field **field, List<Item> &values,

                 bool ignore_errors);

bool fill_record_n_invoke_before_triggers(THD *thd, List<Item> &fields,

                                          List<Item> &values,

                                          bool ignore_errors,

                                          Table_triggers_list *triggers,

                                          enum trg_event_type event);

bool fill_record_n_invoke_before_triggers(THD *thd, Field **field,

                                          List<Item> &values,

                                          bool ignore_errors,

                                          Table_triggers_list *triggers,

                                          enum trg_event_type event);

OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild);



inline TABLE_LIST *find_table_in_global_list(TABLE_LIST *table,