diff options
| author | unknown <mhansson/martin@linux-st28.site> | 2007-08-15 12:03:11 +0200 |
|---|---|---|
| committer | unknown <mhansson/martin@linux-st28.site> | 2007-08-15 12:03:11 +0200 |
| commit | eea647b5d2980735d83ee30231e8e0b51d848848 (patch) | |
| tree | 789836df56a45d36d2746260d77959a239420be2 /mysql-test/include/mix1.inc | |
| parent | 730f7722b4e81dcc3af4ebe1b02b47029f498a46 (diff) | |
| parent | 01f8130aa68392d14f36cc17c01e1b349bf844f5 (diff) | |
| download | mariadb-git-eea647b5d2980735d83ee30231e8e0b51d848848.tar.gz | |
Merge linux-st28.site:/home/martin/mysql/src/bug28570/my50-bug28570
into linux-st28.site:/home/martin/mysql/src/bug28570/my51-bug28570
sql/opt_range.cc:
Auto merged
mysql-test/include/mix1.inc:
Bug#28570: Hand merged test case
mysql-test/r/innodb_mysql.result:
Bug#28570: Hand merged test result
sql/handler.cc:
Bug#28570: Hand merged file
Diffstat (limited to 'mysql-test/include/mix1.inc')
| -rw-r--r-- | mysql-test/include/mix1.inc | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc index 32a3e6b3ebd..5e6a535fce5 100644 --- a/mysql-test/include/mix1.inc +++ b/mysql-test/include/mix1.inc @@ -939,6 +939,36 @@ 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 # Fix for BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY |