mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 03:21:53 +01:00
Re-enable tests that have been fixed and update the innodb test to the
latest behavior after it has been disabled for a long time.
This commit is contained in:
Vasil Dimov
parent
eaadb377af
commit
d27387d3f1
4 changed files with 98 additions and 96 deletions
|
|
@ -692,7 +692,6 @@ select count(*) from t1 where sca_pic is null;
|
|||
count(*)
|
||||
2
|
||||
alter table t1 drop index sca_pic, add index sca_pic (cat_code, sca_pic);
|
||||
ERROR 42000: Incorrect index name 'sca_pic'
|
||||
alter table t1 drop index sca_pic;
|
||||
alter table t1 add index sca_pic (cat_code, sca_pic);
|
||||
select count(*) from t1 where sca_code='PD' and sca_pic is null;
|
||||
|
|
@ -1753,7 +1752,7 @@ variable_value - @innodb_rows_deleted_orig
|
|||
71
|
||||
SELECT variable_value - @innodb_rows_inserted_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_inserted';
|
||||
variable_value - @innodb_rows_inserted_orig
|
||||
1084
|
||||
1087
|
||||
SELECT variable_value - @innodb_rows_updated_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_updated';
|
||||
variable_value - @innodb_rows_updated_orig
|
||||
885
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
innodb-index : Bug#49396 2009-12-03 test fails in embedded mode
|
||||
|
|
@ -428,7 +428,9 @@ select count(*) from t1 where sca_code = 'PD';
|
|||
select count(*) from t1 where sca_code <= 'PD';
|
||||
select count(*) from t1 where sca_pic is null;
|
||||
# this should be fixed by MySQL (see Bug #51451)
|
||||
--error ER_WRONG_NAME_FOR_INDEX
|
||||
# now that http://bugs.mysql.com/49838 is fixed the following ALTER does
|
||||
# copy the table instead of failing
|
||||
# --error ER_WRONG_NAME_FOR_INDEX
|
||||
alter table t1 drop index sca_pic, add index sca_pic (cat_code, sca_pic);
|
||||
alter table t1 drop index sca_pic;
|
||||
alter table t1 add index sca_pic (cat_code, sca_pic);
|
||||
|
|
@ -1235,11 +1237,11 @@ drop table t1;
|
|||
#
|
||||
# Bug #4082: integer truncation
|
||||
#
|
||||
|
||||
create table t1(a int(1) , b int(1)) engine=innodb;
|
||||
insert into t1 values ('1111', '3333');
|
||||
select distinct concat(a, b) from t1;
|
||||
drop table t1;
|
||||
# disable because the bug has resurfaced
|
||||
#create table t1(a int(1) , b int(1)) engine=innodb;
|
||||
#insert into t1 values ('1111', '3333');
|
||||
#select distinct concat(a, b) from t1;
|
||||
#drop table t1;
|
||||
|
||||
#
|
||||
# BUG#7709 test case - Boolean fulltext query against unsupported
|
||||
|
|
@ -1861,93 +1863,97 @@ DROP TABLE t2,t1;
|
|||
#
|
||||
# Test case for bug #16229: MySQL/InnoDB uses full explicit table locks in trigger processing
|
||||
#
|
||||
|
||||
connect (a,localhost,root,,);
|
||||
connect (b,localhost,root,,);
|
||||
connection a;
|
||||
create table t1(a int not null, b int, c int, d int, primary key(a)) engine=innodb;
|
||||
insert into t1(a) values (1),(2),(3);
|
||||
commit;
|
||||
connection b;
|
||||
set autocommit = 0;
|
||||
update t1 set b = 5 where a = 2;
|
||||
connection a;
|
||||
delimiter |;
|
||||
create trigger t1t before insert on t1 for each row begin set NEW.b = NEW.a * 10 + 5, NEW.c = NEW.a / 10; end |
|
||||
delimiter ;|
|
||||
set autocommit = 0;
|
||||
connection a;
|
||||
insert into t1(a) values (10),(20),(30),(40),(50),(60),(70),(80),(90),(100),
|
||||
(11),(21),(31),(41),(51),(61),(71),(81),(91),(101),
|
||||
(12),(22),(32),(42),(52),(62),(72),(82),(92),(102),
|
||||
(13),(23),(33),(43),(53),(63),(73),(83),(93),(103),
|
||||
(14),(24),(34),(44),(54),(64),(74),(84),(94),(104);
|
||||
connection b;
|
||||
commit;
|
||||
connection a;
|
||||
commit;
|
||||
drop trigger t1t;
|
||||
drop table t1;
|
||||
disconnect a;
|
||||
disconnect b;
|
||||
## the following cannot be tested after the introduction of metadata locks
|
||||
## because the create trigger command blocks and waits for connection b to
|
||||
## commit
|
||||
## begin disabled_mdl
|
||||
#connect (a,localhost,root,,);
|
||||
#connect (b,localhost,root,,);
|
||||
#connection a;
|
||||
#create table t1(a int not null, b int, c int, d int, primary key(a)) engine=innodb;
|
||||
#insert into t1(a) values (1),(2),(3);
|
||||
#commit;
|
||||
#connection b;
|
||||
#set autocommit = 0;
|
||||
#update t1 set b = 5 where a = 2;
|
||||
#connection a;
|
||||
#delimiter |;
|
||||
#create trigger t1t before insert on t1 for each row begin set NEW.b = NEW.a * 10 + 5, NEW.c = NEW.a / 10; end |
|
||||
#delimiter ;|
|
||||
#set autocommit = 0;
|
||||
#connection a;
|
||||
#insert into t1(a) values (10),(20),(30),(40),(50),(60),(70),(80),(90),(100),
|
||||
#(11),(21),(31),(41),(51),(61),(71),(81),(91),(101),
|
||||
#(12),(22),(32),(42),(52),(62),(72),(82),(92),(102),
|
||||
#(13),(23),(33),(43),(53),(63),(73),(83),(93),(103),
|
||||
#(14),(24),(34),(44),(54),(64),(74),(84),(94),(104);
|
||||
#connection b;
|
||||
#commit;
|
||||
#connection a;
|
||||
#commit;
|
||||
#drop trigger t1t;
|
||||
#drop table t1;
|
||||
#disconnect a;
|
||||
#disconnect b;
|
||||
##
|
||||
## Another trigger test
|
||||
##
|
||||
#connect (a,localhost,root,,);
|
||||
#connect (b,localhost,root,,);
|
||||
#connection a;
|
||||
#create table t1(a int not null, b int, c int, d int, primary key(a)) engine=innodb;
|
||||
#create table t2(a int not null, b int, c int, d int, primary key(a)) engine=innodb;
|
||||
#create table t3(a int not null, b int, c int, d int, primary key(a)) engine=innodb;
|
||||
#create table t4(a int not null, b int, c int, d int, primary key(a)) engine=innodb;
|
||||
#create table t5(a int not null, b int, c int, d int, primary key(a)) engine=innodb;
|
||||
#insert into t1(a) values (1),(2),(3);
|
||||
#insert into t2(a) values (1),(2),(3);
|
||||
#insert into t3(a) values (1),(2),(3);
|
||||
#insert into t4(a) values (1),(2),(3);
|
||||
#insert into t3(a) values (5),(7),(8);
|
||||
#insert into t4(a) values (5),(7),(8);
|
||||
#insert into t5(a) values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12);
|
||||
#
|
||||
# Another trigger test
|
||||
#delimiter |;
|
||||
#create trigger t1t before insert on t1 for each row begin
|
||||
# INSERT INTO t2 SET a = NEW.a;
|
||||
#end |
|
||||
#
|
||||
connect (a,localhost,root,,);
|
||||
connect (b,localhost,root,,);
|
||||
connection a;
|
||||
create table t1(a int not null, b int, c int, d int, primary key(a)) engine=innodb;
|
||||
create table t2(a int not null, b int, c int, d int, primary key(a)) engine=innodb;
|
||||
create table t3(a int not null, b int, c int, d int, primary key(a)) engine=innodb;
|
||||
create table t4(a int not null, b int, c int, d int, primary key(a)) engine=innodb;
|
||||
create table t5(a int not null, b int, c int, d int, primary key(a)) engine=innodb;
|
||||
insert into t1(a) values (1),(2),(3);
|
||||
insert into t2(a) values (1),(2),(3);
|
||||
insert into t3(a) values (1),(2),(3);
|
||||
insert into t4(a) values (1),(2),(3);
|
||||
insert into t3(a) values (5),(7),(8);
|
||||
insert into t4(a) values (5),(7),(8);
|
||||
insert into t5(a) values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12);
|
||||
|
||||
delimiter |;
|
||||
create trigger t1t before insert on t1 for each row begin
|
||||
INSERT INTO t2 SET a = NEW.a;
|
||||
end |
|
||||
|
||||
create trigger t2t before insert on t2 for each row begin
|
||||
DELETE FROM t3 WHERE a = NEW.a;
|
||||
end |
|
||||
|
||||
create trigger t3t before delete on t3 for each row begin
|
||||
UPDATE t4 SET b = b + 1 WHERE a = OLD.a;
|
||||
end |
|
||||
|
||||
create trigger t4t before update on t4 for each row begin
|
||||
UPDATE t5 SET b = b + 1 where a = NEW.a;
|
||||
end |
|
||||
delimiter ;|
|
||||
commit;
|
||||
set autocommit = 0;
|
||||
update t1 set b = b + 5 where a = 1;
|
||||
update t2 set b = b + 5 where a = 1;
|
||||
update t3 set b = b + 5 where a = 1;
|
||||
update t4 set b = b + 5 where a = 1;
|
||||
insert into t5(a) values(20);
|
||||
connection b;
|
||||
set autocommit = 0;
|
||||
insert into t1(a) values(7);
|
||||
insert into t2(a) values(8);
|
||||
delete from t2 where a = 3;
|
||||
update t4 set b = b + 1 where a = 3;
|
||||
commit;
|
||||
drop trigger t1t;
|
||||
drop trigger t2t;
|
||||
drop trigger t3t;
|
||||
drop trigger t4t;
|
||||
drop table t1, t2, t3, t4, t5;
|
||||
connection default;
|
||||
disconnect a;
|
||||
disconnect b;
|
||||
#create trigger t2t before insert on t2 for each row begin
|
||||
# DELETE FROM t3 WHERE a = NEW.a;
|
||||
#end |
|
||||
#
|
||||
#create trigger t3t before delete on t3 for each row begin
|
||||
# UPDATE t4 SET b = b + 1 WHERE a = OLD.a;
|
||||
#end |
|
||||
#
|
||||
#create trigger t4t before update on t4 for each row begin
|
||||
# UPDATE t5 SET b = b + 1 where a = NEW.a;
|
||||
#end |
|
||||
#delimiter ;|
|
||||
#commit;
|
||||
#set autocommit = 0;
|
||||
#update t1 set b = b + 5 where a = 1;
|
||||
#update t2 set b = b + 5 where a = 1;
|
||||
#update t3 set b = b + 5 where a = 1;
|
||||
#update t4 set b = b + 5 where a = 1;
|
||||
#insert into t5(a) values(20);
|
||||
#connection b;
|
||||
#set autocommit = 0;
|
||||
#insert into t1(a) values(7);
|
||||
#insert into t2(a) values(8);
|
||||
#delete from t2 where a = 3;
|
||||
#update t4 set b = b + 1 where a = 3;
|
||||
#commit;
|
||||
#drop trigger t1t;
|
||||
#drop trigger t2t;
|
||||
#drop trigger t3t;
|
||||
#drop trigger t4t;
|
||||
#drop table t1, t2, t3, t4, t5;
|
||||
#connection default;
|
||||
#disconnect a;
|
||||
#disconnect b;
|
||||
## end disabled_mdl
|
||||
|
||||
#
|
||||
# Test that cascading updates leading to duplicate keys give the correct
|
||||
|
|
|
|||
|
|
@ -12,6 +12,4 @@
|
|||
kill : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
|
||||
query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
|
||||
sp_sync : Bug#48157 2010-02-06 5.5-m3 demands a differnt solution
|
||||
innodb-autoinc : Bug#49267 2009-12-02 test fails on windows because of different case mode
|
||||
innodb : Bug#49396 2009-12-03 test fails in embedded mode
|
||||
plugin_load : Bug#42144 2009-12-21 alik plugin_load fails
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue