1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

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
This commit is contained in:
unknown
2007-08-15 12:03:11 +02:00
4 changed files with 51 additions and 3 deletions

View File

@ -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