summaryrefslogtreecommitdiff
path: root/storage/myisammrg
diff options
context:
space:
mode:
authorElena Stepanova <elenst@gmail.com>2013-08-05 18:30:12 +0400
committerElena Stepanova <elenst@gmail.com>2013-08-05 18:30:12 +0400
commitf596d28df6331003d115e61abd3699d1dd4d950e (patch)
tree0414d8749a6dcb509469c9409254e8a85dfedada /storage/myisammrg
parent04684b7709f55a5a9de9226e834bcfbed05ee5c0 (diff)
downloadmariadb-git-f596d28df6331003d115e61abd3699d1dd4d950e.tar.gz
Deliberate change in behavior introduced along with the fix for MDEV-4310
Diffstat (limited to 'storage/myisammrg')
-rw-r--r--storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff28
-rw-r--r--storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff52
2 files changed, 40 insertions, 40 deletions
diff --git a/storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff b/storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff
index dbf29fb8d00..52e9d9fdbe4 100644
--- a/storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff
+++ b/storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff
@@ -1,5 +1,5 @@
---- type_spatial.result 2013-01-23 01:25:39.143876032 +0400
-+++ type_spatial.reject 2013-01-23 02:51:14.535315418 +0400
+--- suite/storage_engine/type_spatial.result 2013-08-05 17:52:53.000000000 +0400
++++ suite/storage_engine/type_spatial.reject 2013-08-05 17:56:37.000000000 +0400
@@ -2,699 +2,15 @@
DROP DATABASE IF EXISTS gis_ogs;
CREATE DATABASE gis_ogs;
@@ -416,20 +416,20 @@
-first second w c o e d t i r
-120 120 1 1 0 1 0 1 1 0
-120 121 0 0 1 0 0 0 1 0
--120 122 0 1 NULL 0 NULL 0 NULL 0
--120 123 0 1 NULL 0 NULL 0 NULL 0
+-120 122 NULL NULL NULL NULL NULL NULL NULL NULL
+-120 123 NULL NULL NULL NULL NULL NULL NULL NULL
-121 120 0 0 1 0 0 0 1 0
-121 121 1 1 0 1 0 1 1 0
--121 122 0 1 NULL 0 NULL 0 NULL 0
--121 123 0 1 NULL 0 NULL 0 NULL 0
--122 120 1 0 NULL 0 NULL 0 NULL 0
--122 121 1 0 NULL 0 NULL 0 NULL 0
--122 122 1 1 NULL 1 NULL 0 NULL 0
--122 123 1 1 NULL 1 NULL 0 NULL 0
--123 120 1 0 NULL 0 NULL 0 NULL 0
--123 121 1 0 NULL 0 NULL 0 NULL 0
--123 122 1 1 NULL 1 NULL 0 NULL 0
--123 123 1 1 NULL 1 NULL 0 NULL 0
+-121 122 NULL NULL NULL NULL NULL NULL NULL NULL
+-121 123 NULL NULL NULL NULL NULL NULL NULL NULL
+-122 120 NULL NULL NULL NULL NULL NULL NULL NULL
+-122 121 NULL NULL NULL NULL NULL NULL NULL NULL
+-122 122 NULL NULL NULL NULL NULL NULL NULL NULL
+-122 123 NULL NULL NULL NULL NULL NULL NULL NULL
+-123 120 NULL NULL NULL NULL NULL NULL NULL NULL
+-123 121 NULL NULL NULL NULL NULL NULL NULL NULL
+-123 122 NULL NULL NULL NULL NULL NULL NULL NULL
+-123 123 NULL NULL NULL NULL NULL NULL NULL NULL
-DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
-USE gis_ogs;
-# Lakes
diff --git a/storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff b/storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff
index 20d98db1ff2..ecd0025c9d9 100644
--- a/storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff
+++ b/storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff
@@ -1,5 +1,5 @@
---- type_spatial_indexes.result 2013-01-23 01:25:45.367797786 +0400
-+++ type_spatial_indexes.reject 2013-01-23 02:51:15.247306467 +0400
+--- suite/storage_engine/type_spatial_indexes.result 2013-08-05 18:08:49.000000000 +0400
++++ suite/storage_engine/type_spatial_indexes.reject 2013-08-05 18:27:47.000000000 +0400
@@ -2,1399 +2,31 @@
DROP DATABASE IF EXISTS gis_ogs;
CREATE DATABASE gis_ogs;
@@ -416,20 +416,20 @@
-first second w c o e d t i r
-120 120 1 1 0 1 0 1 1 0
-120 121 0 0 1 0 0 0 1 0
--120 122 0 1 NULL 0 NULL 0 NULL 0
--120 123 0 1 NULL 0 NULL 0 NULL 0
+-120 122 NULL NULL NULL NULL NULL NULL NULL NULL
+-120 123 NULL NULL NULL NULL NULL NULL NULL NULL
-121 120 0 0 1 0 0 0 1 0
-121 121 1 1 0 1 0 1 1 0
--121 122 0 1 NULL 0 NULL 0 NULL 0
--121 123 0 1 NULL 0 NULL 0 NULL 0
--122 120 1 0 NULL 0 NULL 0 NULL 0
--122 121 1 0 NULL 0 NULL 0 NULL 0
--122 122 1 1 NULL 1 NULL 0 NULL 0
--122 123 1 1 NULL 1 NULL 0 NULL 0
--123 120 1 0 NULL 0 NULL 0 NULL 0
--123 121 1 0 NULL 0 NULL 0 NULL 0
--123 122 1 1 NULL 1 NULL 0 NULL 0
--123 123 1 1 NULL 1 NULL 0 NULL 0
+-121 122 NULL NULL NULL NULL NULL NULL NULL NULL
+-121 123 NULL NULL NULL NULL NULL NULL NULL NULL
+-122 120 NULL NULL NULL NULL NULL NULL NULL NULL
+-122 121 NULL NULL NULL NULL NULL NULL NULL NULL
+-122 122 NULL NULL NULL NULL NULL NULL NULL NULL
+-122 123 NULL NULL NULL NULL NULL NULL NULL NULL
+-123 120 NULL NULL NULL NULL NULL NULL NULL NULL
+-123 121 NULL NULL NULL NULL NULL NULL NULL NULL
+-123 122 NULL NULL NULL NULL NULL NULL NULL NULL
+-123 123 NULL NULL NULL NULL NULL NULL NULL NULL
-DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
-USE gis_ogs;
-# Lakes
@@ -1126,20 +1126,20 @@
-first second w c o e d t i r
-120 120 1 1 0 1 0 1 1 0
-120 121 0 0 1 0 0 0 1 0
--120 122 0 1 NULL 0 NULL 0 NULL 0
--120 123 0 1 NULL 0 NULL 0 NULL 0
+-120 122 NULL NULL NULL NULL NULL NULL NULL NULL
+-120 123 NULL NULL NULL NULL NULL NULL NULL NULL
-121 120 0 0 1 0 0 0 1 0
-121 121 1 1 0 1 0 1 1 0
--121 122 0 1 NULL 0 NULL 0 NULL 0
--121 123 0 1 NULL 0 NULL 0 NULL 0
--122 120 1 0 NULL 0 NULL 0 NULL 0
--122 121 1 0 NULL 0 NULL 0 NULL 0
--122 122 1 1 NULL 1 NULL 0 NULL 0
--122 123 1 1 NULL 1 NULL 0 NULL 0
--123 120 1 0 NULL 0 NULL 0 NULL 0
--123 121 1 0 NULL 0 NULL 0 NULL 0
--123 122 1 1 NULL 1 NULL 0 NULL 0
--123 123 1 1 NULL 1 NULL 0 NULL 0
+-121 122 NULL NULL NULL NULL NULL NULL NULL NULL
+-121 123 NULL NULL NULL NULL NULL NULL NULL NULL
+-122 120 NULL NULL NULL NULL NULL NULL NULL NULL
+-122 121 NULL NULL NULL NULL NULL NULL NULL NULL
+-122 122 NULL NULL NULL NULL NULL NULL NULL NULL
+-122 123 NULL NULL NULL NULL NULL NULL NULL NULL
+-123 120 NULL NULL NULL NULL NULL NULL NULL NULL
+-123 121 NULL NULL NULL NULL NULL NULL NULL NULL
+-123 122 NULL NULL NULL NULL NULL NULL NULL NULL
+-123 123 NULL NULL NULL NULL NULL NULL NULL NULL
-DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
-USE gis_ogs;
-# Lakes
View Lorry Controller Status