Bug 27577612 - CONCURRENT SERIALIZABLE TRANSACTIONS CAN INSERT INTO

AN AREA SELECTED FOR UPDATE

Followup patch for this bug. Move the new added test out from
rtree_concurrent_srch, since the new test is only for 16k page size.

Author: Allen Lai

mysql-test/suite/innodb_gis/r/rtree_concurrent_srch.result

@@ -323,39 +323,4 @@ count(*)
 drop procedure insert_t1;
 DROP TABLE t1;
 SET SESSION debug="-d,rtr_pcur_move_to_next_return";
-CREATE TABLE g (
-id INT PRIMARY KEY,
-p GEOMETRY NOT NULL,
-SPATIAL KEY p_idx(p)
-) ENGINE=InnoDB;
-create procedure populate_g(IN `rows` INT)
-begin
-declare i int default 1;
-while (i <= `rows`) DO
-insert into test.g (id, p) values (i, POINT(i, i));
-set i = i + 1;
-end while;
-end|
-call populate_g(650);
-start transaction;
-select id from g WHERE MBRContains(ST_GeomFromText('Polygon((100 0,100 5,105
-5,105 0,100 0))'),p) for update;
-id
-set innodb_lock_wait_timeout = 1;
-set transaction isolation level serializable;
-insert into g values(1103, POINT(100, 1));
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction
-start transaction;
-select id from g WHERE MBRContains(ST_GeomFromText('Polygon((100 0,100 5,105
-5,105 0,100 0))'),p) for update;
-id
-commit;
-set innodb_lock_wait_timeout = 1;
-set transaction isolation level serializable;
-insert into g values(1103, POINT(100, 1));
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction
-commit;
-DROP TABLE g;
-DROP PROCEDURE populate_g;
-set innodb_lock_wait_timeout = default;
 SET DEBUG_SYNC = 'RESET';

mysql-test/suite/innodb_gis/r/rtree_concurrent_srch_2.result

@@ -0,0 +1,35 @@
+CREATE TABLE g (
+id INT PRIMARY KEY,
+p GEOMETRY NOT NULL,
+SPATIAL KEY p_idx(p)
+) ENGINE=InnoDB;
+create procedure populate_g(IN `rows` INT)
+begin
+declare i int default 1;
+while (i <= `rows`) DO
+insert into test.g (id, p) values (i, POINT(i, i));
+set i = i + 1;
+end while;
+end|
+call populate_g(650);
+start transaction;
+select id from g WHERE MBRContains(ST_GeomFromText('Polygon((100 0,100 5,105
+5,105 0,100 0))'),p) for update;
+id
+set innodb_lock_wait_timeout = 1;
+set transaction isolation level serializable;
+insert into g values(1103, POINT(100, 1));
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+start transaction;
+select id from g WHERE MBRContains(ST_GeomFromText('Polygon((100 0,100 5,105
+5,105 0,100 0))'),p) for update;
+id
+commit;
+set innodb_lock_wait_timeout = 1;
+set transaction isolation level serializable;
+insert into g values(1103, POINT(100, 1));
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+commit;
+DROP TABLE g;
+DROP PROCEDURE populate_g;
+set innodb_lock_wait_timeout = default;

mysql-test/suite/innodb_gis/t/rtree_concurrent_srch.test

@@ -448,62 +448,4 @@ disconnect b;
 --source include/wait_until_disconnected.inc
 
 connection default;
-CREATE TABLE g (
-  id INT PRIMARY KEY,
-  p GEOMETRY NOT NULL,
-  SPATIAL KEY p_idx(p)
-) ENGINE=InnoDB;
-
-delimiter |;
-create procedure populate_g(IN `rows` INT)
-begin
-        declare i int default 1;
-        while (i <= `rows`) DO
-                insert into test.g (id, p) values (i, POINT(i, i));
-                set i = i + 1;
-        end while;
-end|
-delimiter ;|
-
-call populate_g(650);
-
-start transaction;
-select id from g WHERE MBRContains(ST_GeomFromText('Polygon((100 0,100 5,105
-5,105 0,100 0))'),p) for update;
-
-connect (a,localhost,root,,);
-connection a;
-set innodb_lock_wait_timeout = 1;
-set transaction isolation level serializable;
-
---error ER_LOCK_WAIT_TIMEOUT
-insert into g values(1103, POINT(100, 1));
-
-connect (b,localhost,root,,);
-connection b;
-start transaction;
-select id from g WHERE MBRContains(ST_GeomFromText('Polygon((100 0,100 5,105
-5,105 0,100 0))'),p) for update;
-
-connection default;
-commit;
-
-connection a;
-set innodb_lock_wait_timeout = 1;
-set transaction isolation level serializable;
-
---error ER_LOCK_WAIT_TIMEOUT
-insert into g values(1103, POINT(100, 1));
-disconnect a;
---source include/wait_until_disconnected.inc
-
-connection b;
-commit;
-disconnect b;
---source include/wait_until_disconnected.inc
-
-connection default;
-DROP TABLE g;
-DROP PROCEDURE populate_g;
-set innodb_lock_wait_timeout = default;
 SET DEBUG_SYNC = 'RESET';

mysql-test/suite/innodb_gis/t/rtree_concurrent_srch_2.test

@@ -0,0 +1,66 @@
+# This test case will test concurrent search on R-tree.
+# Not supported in embedded
+--source include/not_embedded.inc
+
+--source include/have_innodb.inc
+--source include/have_debug.inc
+--source include/have_innodb_16k.inc
+
+CREATE TABLE g (
+  id INT PRIMARY KEY,
+  p GEOMETRY NOT NULL,
+  SPATIAL KEY p_idx(p)
+) ENGINE=InnoDB;
+
+delimiter |;
+create procedure populate_g(IN `rows` INT)
+begin
+        declare i int default 1;
+        while (i <= `rows`) DO
+                insert into test.g (id, p) values (i, POINT(i, i));
+                set i = i + 1;
+        end while;
+end|
+delimiter ;|
+
+call populate_g(650);
+
+start transaction;
+select id from g WHERE MBRContains(ST_GeomFromText('Polygon((100 0,100 5,105
+5,105 0,100 0))'),p) for update;
+
+connect (a,localhost,root,,);
+connection a;
+set innodb_lock_wait_timeout = 1;
+set transaction isolation level serializable;
+
+--error ER_LOCK_WAIT_TIMEOUT
+insert into g values(1103, POINT(100, 1));
+
+connect (b,localhost,root,,);
+connection b;
+start transaction;
+select id from g WHERE MBRContains(ST_GeomFromText('Polygon((100 0,100 5,105
+5,105 0,100 0))'),p) for update;
+
+connection default;
+commit;
+
+connection a;
+set innodb_lock_wait_timeout = 1;
+set transaction isolation level serializable;
+
+--error ER_LOCK_WAIT_TIMEOUT
+insert into g values(1103, POINT(100, 1));
+disconnect a;
+--source include/wait_until_disconnected.inc
+
+connection b;
+commit;
+disconnect b;
+--source include/wait_until_disconnected.inc
+
+connection default;
+DROP TABLE g;
+DROP PROCEDURE populate_g;
+set innodb_lock_wait_timeout = default;