Commit 76db096a authored by Daniel Black's avatar Daniel Black

GIS skip_locked_nowait test needs fixing

parent f41f7199
...@@ -156,10 +156,6 @@ SET @g = ST_GeomFromText('POLYGON((0 0,0 4,4 4,0 4,0 0))'); ...@@ -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) SELECT seat_id, state, ST_AsText(pos) FROM t1 FORCE INDEX (pos)
WHERE state = 0 AND MBRWithin(pos, @g) FOR UPDATE NOWAIT; WHERE state = 0 AND MBRWithin(pos, @g) FOR UPDATE NOWAIT;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction 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 SELECT seat_id, state, ST_AsText(pos) FROM t1
WHERE state = 0 FOR UPDATE NOWAIT; WHERE state = 0 FOR UPDATE NOWAIT;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction ERROR HY000: Lock wait timeout exceeded; try restarting transaction
......
...@@ -158,8 +158,9 @@ SET @g = ST_GeomFromText('POLYGON((0 0,0 4,4 4,0 4,0 0))'); ...@@ -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) SELECT seat_id, state, ST_AsText(pos) FROM t1 FORCE INDEX (pos)
WHERE state = 0 AND MBRWithin(pos, @g) FOR UPDATE NOWAIT; WHERE state = 0 AND MBRWithin(pos, @g) FOR UPDATE NOWAIT;
SELECT seat_id, state, ST_AsText(pos) FROM t1 FORCE INDEX (pos) # TODO Needs fixing
WHERE state = 0 AND MBRWithin(pos, @g) FOR UPDATE SKIP LOCKED; #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 --error ER_LOCK_WAIT_TIMEOUT
SELECT seat_id, state, ST_AsText(pos) FROM t1 SELECT seat_id, state, ST_AsText(pos) FROM t1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment