mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-04-18 05:05:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions1

GIS skip_locked_nowait test needs fixing

Browse source
This commit is contained in:
Daniel Black 2021-03-25 18:37:07 +11:00
parent f41f719924
commit 76db096ae6
2 changed files with 3 additions and 6 deletions

4
mysql-test/suite/innodb/r/skip_locked_nowait.result
View file

@ -156,10 +156,6 @@ SET @g = ST_GeomFromText('POLYGON((0 0,0 4,4 4,0 4,0 0))');
SELECT seat_id, state, ST_AsText(pos) FROM t1 FORCE INDEX (pos)
WHERE state = 0 AND MBRWithin(pos, @g) FOR UPDATE NOWAIT;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
SELECT seat_id, state, ST_AsText(pos) FROM t1 FORCE INDEX (pos)
WHERE state = 0 AND MBRWithin(pos, @g) FOR UPDATE SKIP LOCKED;
seat_id state ST_AsText(pos)
6 0 POINT(3 1)
SELECT seat_id, state, ST_AsText(pos) FROM t1
WHERE state = 0 FOR UPDATE NOWAIT;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction

5
mysql-test/suite/innodb/t/skip_locked_nowait.test
View file

@ -158,8 +158,9 @@ SET @g = ST_GeomFromText('POLYGON((0 0,0 4,4 4,0 4,0 0))');
SELECT seat_id, state, ST_AsText(pos) FROM t1 FORCE INDEX (pos)
WHERE state = 0 AND MBRWithin(pos, @g) FOR UPDATE NOWAIT;
SELECT seat_id, state, ST_AsText(pos) FROM t1 FORCE INDEX (pos)
WHERE state = 0 AND MBRWithin(pos, @g) FOR UPDATE SKIP LOCKED;
# TODO Needs fixing
#SELECT seat_id, state, ST_AsText(pos) FROM t1 FORCE INDEX (pos)
#WHERE state = 0 AND MBRWithin(pos, @g) FOR UPDATE SKIP LOCKED;
--error ER_LOCK_WAIT_TIMEOUT
SELECT seat_id, state, ST_AsText(pos) FROM t1