Commit 040397ed authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/dlenev/mysql-5.0-bg18153 

into  mysql.com:/home/dlenev/mysql-5.1-merges


mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
parents c8e6cdda 98dfa6a1

mysql-test/r/trigger-trans.result

0 → 100644
+84 −0
Original line number Diff line number Diff line 
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;

mysql-test/r/trigger.result

+31 −0
Original line number Diff line number Diff line
@@ -860,6 +860,37 @@ trigger_schema trigger_name event_object_schema event_object_table action_statem 
mysqltest	t1_bi	mysqltest	t1	set @a:=new.id

drop trigger test.t1_bi;

ERROR HY000: Trigger does not exist

alter table t1 rename to test.t1;

ERROR HY000: Trigger in wrong schema

insert into t1 values (103);

select @a;

@a

103

select trigger_schema, trigger_name, event_object_schema,

event_object_table, action_statement from information_schema.triggers

where event_object_schema = 'test' or event_object_schema = 'mysqltest';

trigger_schema	trigger_name	event_object_schema	event_object_table	action_statement

mysqltest	t1_bi	mysqltest	t1	set @a:=new.id

drop trigger test.t1_bi;

ERROR HY000: Trigger does not exist

alter table t1 rename to test.t1, add column val int default 0;

ERROR HY000: Trigger in wrong schema

insert into t1 values (104);

select @a;

@a

104

select trigger_schema, trigger_name, event_object_schema,

event_object_table, action_statement from information_schema.triggers

where event_object_schema = 'test' or event_object_schema = 'mysqltest';

trigger_schema	trigger_name	event_object_schema	event_object_table	action_statement

mysqltest	t1_bi	mysqltest	t1	set @a:=new.id

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `id` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop trigger test.t1_bi;

ERROR HY000: Trigger does not exist

drop trigger t1_bi;

drop table t1;

drop database mysqltest;

mysql-test/t/trigger-trans.test

0 → 100644
+52 −0
Original line number Diff line number Diff line 
# Tests which involve triggers and transactions

# (or just InnoDB storage engine)

--source include/have_innodb.inc



--disable_warnings

drop table if exists t1;

--enable_warnings



# Test for bug #18153 "OPTIMIZE/ALTER on transactional tables corrupt

#                      triggers/triggers are lost".



create table t1 (a varchar(16), b int) engine=innodb;

delimiter |;

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|

delimiter ;|

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';

insert into t1 values ('The Lion', 10);

select * from t1;

optimize table 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';

insert into t1 values ('The Unicorn', 20);

select * from t1;

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';

insert into t1 values ('Alice', 30, 1);

select * from t1;

# Special tricky cases allowed by ALTER TABLE ... RENAME

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';

insert into t1 values ('The Crown', 40, 1);

select * from t1;

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';

insert into t1 values ('The Pie', 50, 1, 1);

select * from t1;

drop table t1;



# End of 5.0 tests

mysql-test/t/trigger.test

+23 −0
Original line number Diff line number Diff line
@@ -1017,6 +1017,29 @@ select trigger_schema, trigger_name, event_object_schema, 
# There should be no fantom .TRN files 

--error ER_TRG_DOES_NOT_EXIST

drop trigger test.t1_bi;

# Let us also check handling of this restriction in ALTER TABLE ... RENAME

--error ER_TRG_IN_WRONG_SCHEMA

alter table t1 rename to test.t1;

insert into t1 values (103);

select @a;

select trigger_schema, trigger_name, event_object_schema,

       event_object_table, action_statement from information_schema.triggers

       where event_object_schema = 'test' or event_object_schema = 'mysqltest';

# Again there should be no fantom .TRN files 

--error ER_TRG_DOES_NOT_EXIST

drop trigger test.t1_bi;

--error ER_TRG_IN_WRONG_SCHEMA

alter table t1 rename to test.t1, add column val int default 0;

insert into t1 values (104);

select @a;

select trigger_schema, trigger_name, event_object_schema,

       event_object_table, action_statement from information_schema.triggers

       where event_object_schema = 'test' or event_object_schema = 'mysqltest';

# Table definition should not change

show create table t1;

# And once again check for fantom .TRN files 

--error ER_TRG_DOES_NOT_EXIST

drop trigger test.t1_bi;

drop trigger t1_bi;

drop table t1;

drop database mysqltest;

sql/sql_table.cc

+0 −1
Original line number Diff line number Diff line
@@ -4948,7 +4948,6 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, 
      Win32 and InnoDB can't drop a table that is in use, so we must

      close the original table at before doing the rename

    */

    table_name=thd->strdup(table_name);		// must be saved

    table->s->version= 0;                	// Force removal of table def

    close_cached_table(thd, table);

    table=0;					// Marker that table is closed