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
dd07707b
Commit
dd07707b
authored
17 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/home/hf/work/31158/my50-31158 sql/field.cc: Auto merged
parents
4b48eb6f
8a8d634b
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
58 additions
and
2 deletions
+58
-2
mysql-test/r/gis.result
mysql-test/r/gis.result
+25
-1
mysql-test/t/gis.test
mysql-test/t/gis.test
+31
-0
sql/field.h
sql/field.h
+1
-0
sql/item_geofunc.cc
sql/item_geofunc.cc
+1
-1
No files found.
mysql-test/r/gis.result
View file @
dd07707b
...
@@ -680,7 +680,7 @@ def test t1 t1 g g 255 4294967295 0 Y 144 0 63
...
@@ -680,7 +680,7 @@ def test t1 t1 g g 255 4294967295 0 Y 144 0 63
g
g
select asbinary(g) from t1;
select asbinary(g) from t1;
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
def asbinary(g) 252
8192
0 Y 128 0 63
def asbinary(g) 252
4294967295
0 Y 128 0 63
asbinary(g)
asbinary(g)
drop table t1;
drop table t1;
create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b));
create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b));
...
@@ -742,6 +742,30 @@ select geomfromtext(col9,col89) as a from t1;
...
@@ -742,6 +742,30 @@ select geomfromtext(col9,col89) as a from t1;
a
a
NULL
NULL
DROP TABLE t1;
DROP TABLE t1;
CREATE TABLE t1 (
geomdata polygon NOT NULL,
SPATIAL KEY index_geom (geomdata)
) ENGINE=MyISAM DEFAULT CHARSET=latin2 DELAY_KEY_WRITE=1 ROW_FORMAT=FIXED;
CREATE TABLE t2 (
geomdata polygon NOT NULL,
SPATIAL KEY index_geom (geomdata)
) ENGINE=MyISAM DEFAULT CHARSET=latin2 DELAY_KEY_WRITE=1 ROW_FORMAT=FIXED;
CREATE TABLE t3
select
aswkb(ws.geomdata) AS geomdatawkb
from
t1 ws
union
select
aswkb(ws.geomdata) AS geomdatawkb
from
t2 ws;
describe t3;
Field Type Null Key Default Extra
geomdatawkb longblob YES NULL
drop table t1;
drop table t2;
drop table t3;
End of 4.1 tests
End of 4.1 tests
create table t1 (s1 geometry not null,s2 char(100));
create table t1 (s1 geometry not null,s2 char(100));
create trigger t1_bu before update on t1 for each row set new.s1 = null;
create trigger t1_bu before update on t1 for each row set new.s1 = null;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/gis.test
View file @
dd07707b
...
@@ -439,6 +439,37 @@ INSERT INTO `t1` VALUES ('','0000-00-00');
...
@@ -439,6 +439,37 @@ INSERT INTO `t1` VALUES ('','0000-00-00');
select
geomfromtext
(
col9
,
col89
)
as
a
from
t1
;
select
geomfromtext
(
col9
,
col89
)
as
a
from
t1
;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
#
# Bug #31158 Spatial, Union, LONGBLOB vs BLOB bug (crops data)
#
CREATE
TABLE
t1
(
geomdata
polygon
NOT
NULL
,
SPATIAL
KEY
index_geom
(
geomdata
)
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
latin2
DELAY_KEY_WRITE
=
1
ROW_FORMAT
=
FIXED
;
CREATE
TABLE
t2
(
geomdata
polygon
NOT
NULL
,
SPATIAL
KEY
index_geom
(
geomdata
)
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
latin2
DELAY_KEY_WRITE
=
1
ROW_FORMAT
=
FIXED
;
CREATE
TABLE
t3
select
aswkb
(
ws
.
geomdata
)
AS
geomdatawkb
from
t1
ws
union
select
aswkb
(
ws
.
geomdata
)
AS
geomdatawkb
from
t2
ws
;
describe
t3
;
drop
table
t1
;
drop
table
t2
;
drop
table
t3
;
--
echo
End
of
4.1
tests
--
echo
End
of
4.1
tests
#
#
...
...
This diff is collapsed.
Click to expand it.
sql/field.h
View file @
dd07707b
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
#define NOT_FIXED_DEC 31
#define NOT_FIXED_DEC 31
#define DATETIME_DEC 6
#define DATETIME_DEC 6
const
uint32
max_field_size
=
(
uint32
)
4294967295U
;
class
Send_field
;
class
Send_field
;
class
Protocol
;
class
Protocol
;
...
...
This diff is collapsed.
Click to expand it.
sql/item_geofunc.cc
View file @
dd07707b
...
@@ -34,7 +34,7 @@ void Item_geometry_func::fix_length_and_dec()
...
@@ -34,7 +34,7 @@ void Item_geometry_func::fix_length_and_dec()
{
{
collation
.
set
(
&
my_charset_bin
);
collation
.
set
(
&
my_charset_bin
);
decimals
=
0
;
decimals
=
0
;
max_length
=
MAX_BLOB_WIDTH
;
max_length
=
max_field_size
;
maybe_null
=
1
;
maybe_null
=
1
;
}
}
...
...
This diff is collapsed.
Click to expand it.
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