refs #5974, some test fixes

git-svn-id: file:///svn/mysql/tests/mysql-test@53011 c7de825b-a66e-492c-adef-691d508d4ae1

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

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

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

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

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

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

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

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