diff options
Diffstat (limited to 'mysql-test/suite/innodb_gis')
| -rw-r--r-- | mysql-test/suite/innodb_gis/r/1.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_gis/r/alter_spatial_index.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_gis/r/gis.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_gis/t/alter_spatial_index.test | 3 |
4 files changed, 10 insertions, 3 deletions
diff --git a/mysql-test/suite/innodb_gis/r/1.result b/mysql-test/suite/innodb_gis/r/1.result index 94bd5f3b2e8..0cb2b25bc4d 100644 --- a/mysql-test/suite/innodb_gis/r/1.result +++ b/mysql-test/suite/innodb_gis/r/1.result @@ -737,6 +737,8 @@ NULL DROP TABLE t1; CREATE TABLE `t1` ( `col9` set('a'), `col89` date); INSERT IGNORE INTO `t1` VALUES ('','0000-00-00'); +Warnings: +Warning 1264 Out of range value for column 'col89' at row 1 select ST_geomfromtext(col9,col89) as a from t1; a NULL @@ -787,7 +789,7 @@ drop procedure if exists fn3; create function fn3 () returns point deterministic return ST_GeomFromText("point(1 1)"); show create function fn3; Function sql_mode Create Function character_set_client collation_connection Database Collation -fn3 NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION CREATE DEFINER=`root`@`localhost` FUNCTION `fn3`() RETURNS point +fn3 STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION CREATE DEFINER=`root`@`localhost` FUNCTION `fn3`() RETURNS point DETERMINISTIC return ST_GeomFromText("point(1 1)") latin1 latin1_swedish_ci latin1_swedish_ci select ST_astext(fn3()); 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 78d5f79e311..f4c6dc4bc65 100644 --- a/mysql-test/suite/innodb_gis/r/alter_spatial_index.result +++ b/mysql-test/suite/innodb_gis/r/alter_spatial_index.result @@ -255,7 +255,9 @@ c1 ST_Astext(c2) ST_Astext(c4) INSERT INTO tab SELECT * FROM tab1; ALTER TABLE tab DROP PRIMARY KEY; ALTER TABLE tab DROP INDEX idx2; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TEMPORARY TABLE temp_tab AS SELECT * FROM tab where c1 = c2; +SET sql_mode = DEFAULT; INSERT INTO temp_tab SELECT * FROM tab; CREATE SPATIAL INDEX idx2 ON temp_tab(c2); CREATE SPATIAL INDEX idx3 ON temp_tab(c3); diff --git a/mysql-test/suite/innodb_gis/r/gis.result b/mysql-test/suite/innodb_gis/r/gis.result index fed7592f42b..c27e4e116e8 100644 --- a/mysql-test/suite/innodb_gis/r/gis.result +++ b/mysql-test/suite/innodb_gis/r/gis.result @@ -737,6 +737,8 @@ NULL DROP TABLE t1; CREATE TABLE `t1` ( `col9` set('a'), `col89` date); INSERT IGNORE INTO `t1` VALUES ('','0000-00-00'); +Warnings: +Warning 1264 Out of range value for column 'col89' at row 1 select ST_geomfromtext(col9,col89) as a from t1; a NULL @@ -783,7 +785,7 @@ drop procedure if exists fn3; create function fn3 () returns point deterministic return ST_GeomFromText("point(1 1)"); show create function fn3; Function sql_mode Create Function character_set_client collation_connection Database Collation -fn3 NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION CREATE DEFINER=`root`@`localhost` FUNCTION `fn3`() RETURNS point +fn3 STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION CREATE DEFINER=`root`@`localhost` FUNCTION `fn3`() RETURNS point DETERMINISTIC return ST_GeomFromText("point(1 1)") latin1 latin1_swedish_ci latin1_swedish_ci select ST_astext(fn3()); diff --git a/mysql-test/suite/innodb_gis/t/alter_spatial_index.test b/mysql-test/suite/innodb_gis/t/alter_spatial_index.test index efd6cb6c867..993ebbe9914 100644 --- a/mysql-test/suite/innodb_gis/t/alter_spatial_index.test +++ b/mysql-test/suite/innodb_gis/t/alter_spatial_index.test @@ -303,8 +303,9 @@ ALTER TABLE tab DROP PRIMARY KEY; ALTER TABLE tab DROP INDEX idx2; # Check spatial index on temp tables - +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TEMPORARY TABLE temp_tab AS SELECT * FROM tab where c1 = c2; +SET sql_mode = DEFAULT; INSERT INTO temp_tab SELECT * FROM tab; |