database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge from mysql-5.1-security

Browse Source
This commit is contained in:
Magne Mahre
2011-02-24 12:56:34 +01:00
parent 2109548552 27166fc64f
commit c4108ce3fe
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/r/gis.result
View File

@@ -1035,6 +1035,10 @@ NULL
NULL NULL
drop table t1; drop table t1;
End of 5.1 tests End of 5.1 tests
CREATE TABLE t0 (a BINARY(32) NOT NULL);
CREATE SPATIAL INDEX i on t0 (a);
ERROR 42000: A SPATIAL index may only contain a geometrical type column
INSERT INTO t0 VALUES (1);
CREATE TABLE t1( CREATE TABLE t1(
col0 BINARY NOT NULL, col0 BINARY NOT NULL,
col2 TIMESTAMP, col2 TIMESTAMP,
@@ -1063,5 +1067,4 @@ col2 LINESTRING,
SPATIAL INDEX i1 (col1, col2) SPATIAL INDEX i1 (col1, col2)
); );
ERROR HY000: Incorrect arguments to SPATIAL INDEX ERROR HY000: Incorrect arguments to SPATIAL INDEX
DROP TABLE t1; DROP TABLE t0, t1, t2;
DROP TABLE t2;

10
mysql-test/t/gis.test
View File

@@ -762,7 +762,14 @@ drop table t1;
# #
# Bug #50574 5.5.x allows spatial indexes on non-spatial # Bug #50574 5.5.x allows spatial indexes on non-spatial
# columns, causing crashes! # columns, causing crashes!
# Bug#11767480 SPATIAL INDEXES ON NON-SPATIAL COLUMNS
# CAUSE CRASHES.
# #
CREATE TABLE t0 (a BINARY(32) NOT NULL);
--error ER_SPATIAL_MUST_HAVE_GEOM_COL
CREATE SPATIAL INDEX i on t0 (a);
INSERT INTO t0 VALUES (1);
--error ER_SPATIAL_MUST_HAVE_GEOM_COL --error ER_SPATIAL_MUST_HAVE_GEOM_COL
CREATE TABLE t1( CREATE TABLE t1(
col0 BINARY NOT NULL, col0 BINARY NOT NULL,
@@ -800,6 +807,5 @@ CREATE TABLE t3 (
); );
# cleanup # cleanup
DROP TABLE t1; DROP TABLE t0, t1, t2;
DROP TABLE t2;