diff options
Diffstat (limited to 'mysql-test/suite/innodb_gis/t')
6 files changed, 27 insertions, 26 deletions
diff --git a/mysql-test/suite/innodb_gis/t/rtree_add_index.test b/mysql-test/suite/innodb_gis/t/rtree_add_index.test index 81755124..a11f1783 100644 --- a/mysql-test/suite/innodb_gis/t/rtree_add_index.test +++ b/mysql-test/suite/innodb_gis/t/rtree_add_index.test @@ -1,6 +1,6 @@ --source include/have_innodb.inc -CREATE TABLE t1 (g MULTIPOINT NOT NULL) ENGINE=InnoDB; +CREATE TABLE t1 (g MULTIPOINT NOT NULL) ENGINE=InnoDB STATS_PERSISTENT=0; INSERT INTO t1 VALUES (''); connect purge_control,localhost,root; diff --git a/mysql-test/suite/innodb_gis/t/rtree_compress.test b/mysql-test/suite/innodb_gis/t/rtree_compress.test index e667ec8e..56690b88 100644 --- a/mysql-test/suite/innodb_gis/t/rtree_compress.test +++ b/mysql-test/suite/innodb_gis/t/rtree_compress.test @@ -10,9 +10,11 @@ # Valgrind takes too much time on PB2 even in the --big-test runs. --source include/not_valgrind.inc -create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb ROW_FORMAT=COMPRESSED; +create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb ROW_FORMAT=COMPRESSED STATS_PERSISTENT=0; # Insert enough values to let R-tree split. +lock tables t1 write; +start transaction; insert into t1 values(1, Point(1,1)); insert into t1 values(2, Point(2,2)); insert into t1 values(3, Point(3,3)); @@ -33,6 +35,8 @@ insert into t1 select * from t1; insert into t1 select * from t1; insert into t1 select * from t1; insert into t1 select * from t1; +commit; +unlock tables; start transaction; insert into t1 select * from t1; select count(*) from t1; diff --git a/mysql-test/suite/innodb_gis/t/rtree_create_inplace.opt b/mysql-test/suite/innodb_gis/t/rtree_create_inplace.opt new file mode 100644 index 00000000..c3f4a891 --- /dev/null +++ b/mysql-test/suite/innodb_gis/t/rtree_create_inplace.opt @@ -0,0 +1 @@ +--innodb_sort_buffer_size=64k diff --git a/mysql-test/suite/innodb_gis/t/rtree_create_inplace.test b/mysql-test/suite/innodb_gis/t/rtree_create_inplace.test index ef3f0171..73469368 100644 --- a/mysql-test/suite/innodb_gis/t/rtree_create_inplace.test +++ b/mysql-test/suite/innodb_gis/t/rtree_create_inplace.test @@ -2,32 +2,27 @@ --source include/have_innodb.inc --source include/have_debug.inc +--source include/have_sequence.inc --source include/no_valgrind_without_big.inc # Create table with geometry column CREATE TABLE t1 (c1 INT, c2 GEOMETRY NOT NULL, c3 GEOMETRY NOT NULL) ENGINE=INNODB; +CREATE TEMPORARY TABLE t LIKE t1; # Insert enough values -INSERT INTO t1 VALUES(1, Point(1,1), ST_GeomFromText('POLYGON (( 0 -1, 0 1, 2 1, 2 -1, 0 -1))')); -INSERT INTO t1 VALUES(2, Point(2,2), ST_GeomFromText('POLYGON (( 0 -3, 0 -1, 2 -1, 2 -3, 0 -3))')); -INSERT INTO t1 VALUES(3, Point(3,3), ST_GeomFromText('POLYGON (( 1 0, 1 2, 3 2, 3 0, 1 0))')); -INSERT INTO t1 VALUES(4, Point(4,4), ST_GeomFromText('POLYGON (( -3 0, -3 2, -1 2, -1 0, -3 0))')); -INSERT INTO t1 VALUES(5, Point(5,5), ST_GeomFromText('POLYGON (( 0 0, 0 1, 1 1, 1 0, 0 0))')); -INSERT INTO t1 VALUES(6, Point(6,6), ST_GeomFromText('POLYGON (( 2 0, 2 2, 4 2, 4 0, 2 0))')); -INSERT INTO t1 VALUES(7, Point(7,7), ST_GeomFromText('POLYGON (( 0 3, 0 5, 2 5, 2 3, 0 3))')); -INSERT INTO t1 VALUES(8, Point(8,8), ST_GeomFromText('POLYGON (( 0 1, 0 3, 2 3, 2 1, 0 1))')); -INSERT INTO t1 VALUES(9, Point(9,9), ST_GeomFromText('POLYGON (( 0 0, 0 3, 3 3, 3 0, 0 0))')); - -INSERT INTO t1 SELECT * FROM t1; -INSERT INTO t1 SELECT * FROM t1; -INSERT INTO t1 SELECT * FROM t1; -INSERT INTO t1 SELECT * FROM t1; - -INSERT INTO t1 SELECT * FROM t1; -INSERT INTO t1 SELECT * FROM t1; -INSERT INTO t1 SELECT * FROM t1; -INSERT INTO t1 SELECT * FROM t1; -INSERT INTO t1 SELECT * FROM t1; +INSERT INTO t VALUES +(1, Point(1,1), ST_GeomFromText('POLYGON (( 0 -1, 0 1, 2 1, 2 -1, 0 -1))')), +(2, Point(2,2), ST_GeomFromText('POLYGON (( 0 -3, 0 -1, 2 -1, 2 -3, 0 -3))')), +(3, Point(3,3), ST_GeomFromText('POLYGON (( 1 0, 1 2, 3 2, 3 0, 1 0))')), +(4, Point(4,4), ST_GeomFromText('POLYGON (( -3 0, -3 2, -1 2, -1 0, -3 0))')), +(5, Point(5,5), ST_GeomFromText('POLYGON (( 0 0, 0 1, 1 1, 1 0, 0 0))')), +(6, Point(6,6), ST_GeomFromText('POLYGON (( 2 0, 2 2, 4 2, 4 0, 2 0))')), +(7, Point(7,7), ST_GeomFromText('POLYGON (( 0 3, 0 5, 2 5, 2 3, 0 3))')), +(8, Point(8,8), ST_GeomFromText('POLYGON (( 0 1, 0 3, 2 3, 2 1, 0 1))')), +(9, Point(9,9), ST_GeomFromText('POLYGON (( 0 0, 0 3, 3 3, 3 0, 0 0))')); + +INSERT INTO t1 SELECT t.* FROM t, seq_1_to_512; +DROP TEMPORARY TABLE t; # create spatial index CREATE SPATIAL INDEX idx ON t1(c2); @@ -42,8 +37,9 @@ SELECT COUNT(*) FROM t1 WHERE MBRWithin(t1.c2, @g1); ALTER TABLE t1 DROP INDEX idx, ADD SPATIAL INDEX idx3(c2); -SET SESSION debug="+d,row_merge_instrument_log_check_flush"; +SET debug_dbug='+d,row_merge_instrument_log_check_flush'; ALTER TABLE t1 DROP INDEX idx3, ADD SPATIAL INDEX idx4(c2), ADD SPATIAL INDEX idx5(c3); +ALTER TABLE t1 FORCE; # Clean up. DROP TABLE t1; diff --git a/mysql-test/suite/innodb_gis/t/rtree_purge.test b/mysql-test/suite/innodb_gis/t/rtree_purge.test index cab86aa6..194c8a23 100644 --- a/mysql-test/suite/innodb_gis/t/rtree_purge.test +++ b/mysql-test/suite/innodb_gis/t/rtree_purge.test @@ -8,7 +8,7 @@ create table t ( b point not null,d point not null, spatial key (d),spatial key (b) -) engine=innodb; +) engine=innodb stats_persistent=0; --disable_query_log set @p=point(1,1); diff --git a/mysql-test/suite/innodb_gis/t/rtree_undo.test b/mysql-test/suite/innodb_gis/t/rtree_undo.test index 962ff780..9126b96d 100644 --- a/mysql-test/suite/innodb_gis/t/rtree_undo.test +++ b/mysql-test/suite/innodb_gis/t/rtree_undo.test @@ -17,7 +17,7 @@ CREATE TABLE t1 ( p INT NOT NULL AUTO_INCREMENT, g LINESTRING NOT NULL, PRIMARY KEY(p) -) ENGINE=InnoDB; +) ENGINE=InnoDB STATS_PERSISTENT=0; if ($index == 3) { eval ALTER TABLE t1 ADD INDEX prefix_idx (g($prefix_size)); @@ -88,7 +88,7 @@ CREATE TABLE t2 ( SPATIAL KEY (g4), SPATIAL KEY (g5), SPATIAL KEY (g6) -) ENGINE=InnoDB; +) ENGINE=InnoDB STATS_PERSISTENT=0; DROP TABLE t1,t2; |