summaryrefslogtreecommitdiff
path: root/mysql-test/suite/sys_vars/t/tx_isolation_func.test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@oracle.com>2010-05-11 20:02:49 +0300
committerMarko Mäkelä <marko.makela@oracle.com>2010-05-11 20:02:49 +0300
commit8de7ea8f2cb568214bffcf2ce6c2a0fbcf4ec110 (patch)
tree8e0e6f3ddea8f47fb46309575646a0e551bc5601 /mysql-test/suite/sys_vars/t/tx_isolation_func.test
parent8079d0d6352de732f70492061dc03ae1f4ab8b7d (diff)
downloadmariadb-git-8de7ea8f2cb568214bffcf2ce6c2a0fbcf4ec110.tar.gz
Merge from mysql-5.1-innodb:
------------------------------------------------------------ revno: 3459 revision-id: marko.makela@oracle.com-20100511165845-lsw7seixftgzpfqt parent: vasil.dimov@oracle.com-20100511110029-18xvuu6r7har8toh committer: Marko Mäkelä <marko.makela@oracle.com> branch nick: mysql-5.1-innodb2 timestamp: Tue 2010-05-11 19:58:45 +0300 message: Fix sys_vars.tx_isolation_func.test, which was broken in revno 3432 when making READ UNCOMMITTED lock as little as READ COMMITTED.
Diffstat (limited to 'mysql-test/suite/sys_vars/t/tx_isolation_func.test')
-rw-r--r--mysql-test/suite/sys_vars/t/tx_isolation_func.test3
1 files changed, 0 insertions, 3 deletions
diff --git a/mysql-test/suite/sys_vars/t/tx_isolation_func.test b/mysql-test/suite/sys_vars/t/tx_isolation_func.test
index 1fd2e323db8..7072de6b086 100644
--- a/mysql-test/suite/sys_vars/t/tx_isolation_func.test
+++ b/mysql-test/suite/sys_vars/t/tx_isolation_func.test
@@ -134,12 +134,9 @@ START TRANSACTION;
SELECT * FROM t1;
---error ER_LOCK_WAIT_TIMEOUT
INSERT INTO t1 VALUES(23, 23);
---error ER_LOCK_WAIT_TIMEOUT
INSERT INTO t1 VALUES(25, 25);
---echo Bug: Only even rows are being locked, error 1205 should'nt have occured
SELECT * FROM t1;