Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
62feb0c5
Commit
62feb0c5
authored
Jul 26, 2013
by
Alexey Botchkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
main.gis test fixed.
parent
b385fdc6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
mysql-test/r/gis.result
mysql-test/r/gis.result
+6
-6
mysql-test/t/gis.test
mysql-test/t/gis.test
+2
-2
No files found.
mysql-test/r/gis.result
View file @
62feb0c5
...
...
@@ -918,25 +918,25 @@ SELECT Overlaps(@horiz1, @point2) FROM DUAL;
Overlaps(@horiz1, @point2)
0
DROP TABLE t1;
create table t1(f1 geometry, f2
point
, f3 linestring);
create table t1(f1 geometry, f2
linestring
, f3 linestring);
select f1 from t1 union select f1 from t1;
f1
insert into t1 (f2,f3) values (GeomFromText('
POINT(1 1
)'),
insert into t1 (f2,f3) values (GeomFromText('
LINESTRING(1 1, 2 2
)'),
GeomFromText('LINESTRING(0 0,1 1,2 2)'));
select AsText(f2),AsText(f3) from t1;
AsText(f2) AsText(f3)
POINT(1 1
) LINESTRING(0 0,1 1,2 2)
LINESTRING(1 1,2 2
) LINESTRING(0 0,1 1,2 2)
select AsText(a) from (select f2 as a from t1 union select f3 from t1) t;
AsText(a)
POINT(1 1
)
LINESTRING(1 1,2 2
)
LINESTRING(0 0,1 1,2 2)
create table t2 as select f2 as a from t1 union select f3 from t1;
desc t2;
Field Type Null Key Default Extra
a
point
YES NULL
a
linestring
YES NULL
select AsText(a) from t2;
AsText(a)
POINT(1 1
)
LINESTRING(1 1,2 2
)
LINESTRING(0 0,1 1,2 2)
drop table t1, t2;
SELECT 1;
...
...
mysql-test/t/gis.test
View file @
62feb0c5
...
...
@@ -609,9 +609,9 @@ DROP TABLE t1;
#
# Bug#28763: Selecting geometry fields in UNION caused server crash.
#
create
table
t1
(
f1
geometry
,
f2
point
,
f3
linestring
);
create
table
t1
(
f1
geometry
,
f2
linestring
,
f3
linestring
);
select
f1
from
t1
union
select
f1
from
t1
;
insert
into
t1
(
f2
,
f3
)
values
(
GeomFromText
(
'
POINT(1 1
)'
),
insert
into
t1
(
f2
,
f3
)
values
(
GeomFromText
(
'
LINESTRING(1 1, 2 2
)'
),
GeomFromText
(
'LINESTRING(0 0,1 1,2 2)'
));
select
AsText
(
f2
),
AsText
(
f3
)
from
t1
;
select
AsText
(
a
)
from
(
select
f2
as
a
from
t1
union
select
f3
from
t1
)
t
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment