mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refs #5974, some test fixes

Browse source 
git-svn-id: file:///svn/mysql/tests/mysql-test@53011 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Zardosht Kasheff 2013-02-08 13:27:41 +00:00
parent 7704c77ae1
commit 9292adb47c
4 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/suite/tokudb.mvcc/r/2808-read-committed.result
View file

@ -47,13 +47,13 @@ create table foo_isam (a int, b int)engine=MyISAM;
begin; begin;
insert into foo_isam select * from foo; insert into foo_isam select * from foo;
insert into foo values (5,5); insert into foo values (5,5);
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
select * from foo; select * from foo;
a b a b
1 1 1 1
2 2 2 2
3 1 3 1
4 3 4 3
5 5
commit; commit;
set session transaction isolation level serializable; set session transaction isolation level serializable;
DROP TABLE foo, foo_isam; DROP TABLE foo, foo_isam;

2
mysql-test/suite/tokudb.mvcc/r/2808-read-uncommitted.result
View file

@ -47,13 +47,13 @@ create table foo_isam (a int, b int)engine=MyISAM;
begin; begin;
insert into foo_isam select * from foo; insert into foo_isam select * from foo;
insert into foo values (5,5); insert into foo values (5,5);
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
select * from foo; select * from foo;
a b a b
1 1 1 1
2 2 2 2
3 1 3 1
4 3 4 3
5 5
commit; commit;
set session transaction isolation level serializable; set session transaction isolation level serializable;
DROP TABLE foo, foo_isam; DROP TABLE foo, foo_isam;

1
mysql-test/suite/tokudb.mvcc/t/2808-read-committed.test
View file

@ -41,7 +41,6 @@ begin;
insert into foo_isam select * from foo; insert into foo_isam select * from foo;
connection default; connection default;
--error ER_LOCK_WAIT_TIMEOUT
insert into foo values (5,5); insert into foo values (5,5);
select * from foo; select * from foo;

1
mysql-test/suite/tokudb.mvcc/t/2808-read-uncommitted.test
View file

@ -41,7 +41,6 @@ begin;
insert into foo_isam select * from foo; insert into foo_isam select * from foo;
connection default; connection default;
--error ER_LOCK_WAIT_TIMEOUT
insert into foo values (5,5); insert into foo values (5,5);
select * from foo; select * from foo;