diff options
| author | unknown <mhansson@dl145s.mysql.com> | 2007-08-16 14:13:07 +0200 |
|---|---|---|
| committer | unknown <mhansson@dl145s.mysql.com> | 2007-08-16 14:13:07 +0200 |
| commit | f4a163c3a531fecf6cf20c80ce9a7e57d357f11a (patch) | |
| tree | a052b07d62e341ad24fc20ade392e9e8bc835c7c /mysql-test/t | |
| parent | bbf2211bdcd43581b9ddf54f1bfc731384e289c7 (diff) | |
| parent | 01f8130aa68392d14f36cc17c01e1b349bf844f5 (diff) | |
| download | mariadb-git-f4a163c3a531fecf6cf20c80ce9a7e57d357f11a.tar.gz | |
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into dl145s.mysql.com:/data0/mhansson/my50-bug28570
sql/opt_range.cc:
Auto merged
mysql-test/r/innodb_mysql.result:
Bug#28570: Manual Merge
mysql-test/t/innodb_mysql.test:
Bug#28570: Manual Merge
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/innodb_mysql.test | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/mysql-test/t/innodb_mysql.test b/mysql-test/t/innodb_mysql.test index adcfec68d3e..aecefda93d3 100644 --- a/mysql-test/t/innodb_mysql.test +++ b/mysql-test/t/innodb_mysql.test @@ -881,5 +881,33 @@ insert into t1 values('aaa'); alter table t1 add index(a(1024)); show create table t1; drop table t1; +# Bug #28570: handler::index_read() is called with different find_flag when +# ORDER BY is used +# + +CREATE TABLE t1 ( + a INT, + b INT, + KEY (b) +) ENGINE=InnoDB; + +INSERT INTO t1 VALUES (1,10), (2,10), (2,20), (3,30); + +START TRANSACTION; +SELECT * FROM t1 WHERE b=20 FOR UPDATE; + +--connect (conn2, localhost, root,,test) + +# This statement gives a "failed: 1205: Lock wait timeout exceeded; try +# restarting transaction" message when the bug is present. +START TRANSACTION; +SELECT * FROM t1 WHERE b=10 ORDER BY A FOR UPDATE; +ROLLBACK; + +--disconnect conn2 +--connection default + +ROLLBACK; +DROP TABLE t1; --echo End of 5.0 tests |