diff options
Diffstat (limited to 'mysql-test/suite/innodb_gis/r/alter_spatial_index.result')
| -rw-r--r-- | mysql-test/suite/innodb_gis/r/alter_spatial_index.result | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/mysql-test/suite/innodb_gis/r/alter_spatial_index.result b/mysql-test/suite/innodb_gis/r/alter_spatial_index.result index ae9dd47233b..ac4a9c7b1c4 100644 --- a/mysql-test/suite/innodb_gis/r/alter_spatial_index.result +++ b/mysql-test/suite/innodb_gis/r/alter_spatial_index.result @@ -128,7 +128,7 @@ tab CREATE TABLE `tab` ( SPATIAL KEY `idx4` (`c4`) COMMENT 'testing spatial index on Polygon', SPATIAL KEY `idx5` (`c5`) COMMENT 'testing spatial index on Geometry', KEY `idx6` (`c4`(10)) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW INDEX FROM tab; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored tab 0 PRIMARY 1 c1 A # NULL NULL BTREE NO @@ -172,7 +172,7 @@ tab CREATE TABLE `tab` ( SPATIAL KEY `idx4` (`c44`) COMMENT 'testing spatial index on Polygon', SPATIAL KEY `idx5` (`c5`) COMMENT 'testing spatial index on Geometry', KEY `idx6` (`c44`(10)) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW INDEX FROM tab; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored tab 0 PRIMARY 1 c1 A # NULL NULL BTREE NO @@ -204,7 +204,7 @@ tab CREATE TABLE `tab` ( SPATIAL KEY `idx4` (`c4`) COMMENT 'testing spatial index on Polygon', SPATIAL KEY `idx5` (`c5`) COMMENT 'testing spatial index on Geometry', KEY `idx6` (`c4`(10)) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW INDEX FROM tab; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored tab 0 PRIMARY 1 c1 A # NULL NULL BTREE NO @@ -261,7 +261,7 @@ tab CREATE TABLE `tab` ( `c4` polygon NOT NULL, `c5` geometry NOT NULL, PRIMARY KEY (`c2`(25)) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CHECK TABLE tab; Table Op Msg_type Msg_text test.tab check status OK @@ -314,7 +314,7 @@ temp_tab CREATE TEMPORARY TABLE `temp_tab` ( SPATIAL KEY `idx3` (`c3`), SPATIAL KEY `idx4` (`c4`), SPATIAL KEY `idx5` (`c5`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SET @g1 = ST_GeomFromText( 'POLYGON((7 1,6 2,6 3,10 3,10 1,7 1))'); SELECT c1,ST_Astext(c2),ST_Astext(c4) FROM temp_tab WHERE MBRContains(temp_tab.c4, @g1) ORDER BY c1; c1 ST_Astext(c2) ST_Astext(c4) @@ -333,7 +333,7 @@ tab CREATE TABLE `tab` ( `c3` linestring NOT NULL, `c4` polygon NOT NULL, `c5` geometry NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW INDEX FROM tab; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored DELETE FROM tab; @@ -357,7 +357,7 @@ tab CREATE TABLE `tab` ( PRIMARY KEY (`c2`(25)), UNIQUE KEY `const_1` (`c2`(25)), SPATIAL KEY `idx2` (`c2`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW INDEX FROM tab; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored tab 0 PRIMARY 1 c2 A # 25 NULL BTREE NO @@ -391,7 +391,7 @@ tab CREATE TABLE `tab` ( PRIMARY KEY (`c5`(10)), UNIQUE KEY `const_1` (`c5`(10)), SPATIAL KEY `idx2` (`c2`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW INDEX FROM tab; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored tab 0 PRIMARY 1 c5 A # 10 NULL BTREE NO @@ -521,7 +521,7 @@ tab CREATE TABLE `tab` ( SPATIAL KEY `idx4` (`c4`) COMMENT 'testing spatial index on Polygon', SPATIAL KEY `idx5` (`c5`) COMMENT 'testing spatial index on Geometry', KEY `idx6` (`c4`(10)) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW INDEX FROM tab; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored tab 0 PRIMARY 1 c1 A # NULL NULL BTREE NO @@ -558,7 +558,7 @@ tab CREATE TABLE `tab` ( SPATIAL KEY `idx4` (`c4`) COMMENT 'testing spatial index on Polygon', SPATIAL KEY `idx5` (`c5`) COMMENT 'testing spatial index on Geometry', KEY `idx6` (`c4`(10)) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW INDEX FROM tab; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored tab 0 PRIMARY 1 c1 A # NULL NULL BTREE NO @@ -615,7 +615,7 @@ tab CREATE TABLE `tab` ( SPATIAL KEY `idx4` (`c4`) COMMENT 'testing spatial index on Polygon', SPATIAL KEY `idx5` (`c5`) COMMENT 'testing spatial index on Geometry', KEY `idx6` (`c4`(10)) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW INDEX FROM tab; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored tab 0 PRIMARY 1 c1 A # NULL NULL BTREE NO @@ -690,14 +690,14 @@ parent CREATE TABLE `parent` ( `id` point NOT NULL, PRIMARY KEY (`id`(25)), SPATIAL KEY `idx1` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW CREATE TABLE child; Table Create Table child CREATE TABLE `child` ( `id` geometry NOT NULL, `parent_id` point NOT NULL, SPATIAL KEY `idx2` (`parent_id`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW INDEX FROM parent; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored parent 0 PRIMARY 1 id A 0 25 NULL BTREE NO @@ -722,14 +722,14 @@ parent CREATE TABLE `parent` ( `id` geometry NOT NULL, PRIMARY KEY (`id`(10)), SPATIAL KEY `idx1` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW CREATE TABLE child; Table Create Table child CREATE TABLE `child` ( `id` geometry NOT NULL, `parent_id` geometry NOT NULL, SPATIAL KEY `idx2` (`parent_id`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW INDEX FROM parent; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored parent 0 PRIMARY 1 id A 0 10 NULL BTREE NO @@ -786,3 +786,13 @@ CREATE OR REPLACE TABLE t1 (a INT) ENGINE=InnoDB; ALTER TABLE t1 ADD COLUMN b POINT DEFAULT '0'; ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field DROP TABLE t1; +# +# MDEV-29520 heap-use-after-poison in row_merge_spatial_rows() +# +CREATE TABLE t +(a VARCHAR(8192), b POINT NOT NULL, PRIMARY KEY(a(8)), SPATIAL(b)) +ENGINE=InnoDB; +INSERT INTO t VALUES (REPEAT('MariaDB Corporation Ab ',351),POINT(0,0)); +ALTER TABLE t FORCE; +DROP TABLE t; +# End of 10.3 tests |