diff options
author | Alexander Barkov <bar@mariadb.org> | 2017-03-31 16:40:29 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.org> | 2017-03-31 16:40:29 +0400 |
commit | f00a314f9a659399eff392c4b635d1c381b9badb (patch) | |
tree | c64e89699dcc22b4ba3a62f83f21252c486617ce /mysql-test/r/gis.result | |
parent | e191833d758e89d282aea2d84126c9ca10036571 (diff) | |
parent | 2f3d4bd566b5e377fe8a1749c14050b0a0e083d0 (diff) | |
download | mariadb-git-f00a314f9a659399eff392c4b635d1c381b9badb.tar.gz |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'mysql-test/r/gis.result')
-rw-r--r-- | mysql-test/r/gis.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 484d2ba4277..4213a5bf791 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -1726,7 +1726,7 @@ SPATIAL_REF_SYS CREATE TEMPORARY TABLE `SPATIAL_REF_SYS` ( ) ENGINE=MEMORY DEFAULT CHARSET=utf8 create table t1(g GEOMETRY, pt POINT); create table t2(g LINESTRING, pl POLYGON); -select * from information_schema.geometry_columns; +select * from information_schema.geometry_columns where f_table_schema='test'; F_TABLE_CATALOG F_TABLE_SCHEMA F_TABLE_NAME F_GEOMETRY_COLUMN G_TABLE_CATALOG G_TABLE_SCHEMA G_TABLE_NAME G_GEOMETRY_COLUMN STORAGE_TYPE GEOMETRY_TYPE COORD_DIMENSION MAX_PPR SRID def test t1 def test t1 g 1 0 2 0 0 def test t1 def test t1 pt 1 1 2 0 0 @@ -1735,7 +1735,7 @@ def test t2 def test t2 pl 1 3 2 0 0 drop table t1, t2; 10.1 tests create table t1(g GEOMETRY(9,4) REF_SYSTEM_ID=101, pt POINT(8,2), pg GEOMETRY REF_SYSTEM_ID=102); -SELECT SRID from information_schema.geometry_columns WHERE G_TABLE_NAME='t1'; +SELECT SRID from information_schema.geometry_columns WHERE f_table_schema='test' and G_TABLE_NAME='t1'; SRID 101 0 |