From a6a4c25bf7d943ff5a429fbf32fe04fdaca25b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Thu, 12 Oct 2017 17:21:04 +0300 Subject: MariaDB adjustments to innodb_gis tests. Some test are still disabled as they provide different results, fail on different error or crash. Fixes also MDEV-14060 InnoDB: Foreign key constraint to geometry type does not work where test intentionally tried incorrect cases. --- mysql-test/suite/innodb_gis/t/point_basic.test | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'mysql-test/suite/innodb_gis/t/point_basic.test') diff --git a/mysql-test/suite/innodb_gis/t/point_basic.test b/mysql-test/suite/innodb_gis/t/point_basic.test index c6a2a673c19..1c0d229802b 100644 --- a/mysql-test/suite/innodb_gis/t/point_basic.test +++ b/mysql-test/suite/innodb_gis/t/point_basic.test @@ -772,16 +772,25 @@ ALTER TABLE child ADD SPATIAL INDEX idx2(p ASC); SHOW CREATE TABLE parent; SHOW CREATE TABLE child; ---error ER_CANNOT_ADD_FOREIGN +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +--error ER_CANT_CREATE_TABLE ALTER TABLE child ADD FOREIGN KEY(p) REFERENCES parent(p); +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +show warnings; ALTER TABLE parent DROP INDEX idx1; ---error ER_CANNOT_ADD_FOREIGN +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +--error ER_CANNOT_ADD_FOREIGN,ER_CANT_CREATE_TABLE ALTER TABLE child ADD FOREIGN KEY(p) REFERENCES parent(p); +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +show warnings; ALTER TABLE child DROP INDEX idx2; ---error ER_CANNOT_ADD_FOREIGN +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +--error ER_CANNOT_ADD_FOREIGN,ER_CANT_CREATE_TABLE ALTER TABLE child ADD FOREIGN KEY(p) REFERENCES parent(p); +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +show warnings; DROP TABLE child, parent; -- cgit v1.2.1