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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
fbbaf00a
Commit
fbbaf00a
authored
18 years ago
by
holyfoot/hf@mysql.com/deer.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/home/hf/work/21888/my50-21888
parents
3cf09035
348e3570
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
0 deletions
+36
-0
myisam/mi_range.c
myisam/mi_range.c
+15
-0
mysql-test/r/gis-rtree.result
mysql-test/r/gis-rtree.result
+11
-0
mysql-test/t/gis-rtree.test
mysql-test/t/gis-rtree.test
+10
-0
No files found.
myisam/mi_range.c
View file @
fbbaf00a
...
@@ -71,6 +71,21 @@ ha_rows mi_records_in_range(MI_INFO *info, int inx, key_range *min_key,
...
@@ -71,6 +71,21 @@ ha_rows mi_records_in_range(MI_INFO *info, int inx, key_range *min_key,
uchar
*
key_buff
;
uchar
*
key_buff
;
uint
start_key_len
;
uint
start_key_len
;
/*
The problem is that the optimizer doesn't support
RTree keys properly at the moment.
Hope this will be fixed some day.
But now NULL in the min_key means that we
didn't make the task for the RTree key
and expect BTree functionality from it.
As it's not able to handle such request
we return the error.
*/
if
(
!
min_key
)
{
res
=
HA_POS_ERROR
;
break
;
}
key_buff
=
info
->
lastkey
+
info
->
s
->
base
.
max_key_length
;
key_buff
=
info
->
lastkey
+
info
->
s
->
base
.
max_key_length
;
start_key_len
=
_mi_pack_key
(
info
,
inx
,
key_buff
,
start_key_len
=
_mi_pack_key
(
info
,
inx
,
key_buff
,
(
uchar
*
)
min_key
->
key
,
min_key
->
length
,
(
uchar
*
)
min_key
->
key
,
min_key
->
length
,
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/gis-rtree.result
View file @
fbbaf00a
...
@@ -862,3 +862,14 @@ CHECK TABLE t1 EXTENDED;
...
@@ -862,3 +862,14 @@ CHECK TABLE t1 EXTENDED;
Table Op Msg_type Msg_text
Table Op Msg_type Msg_text
test.t1 check status OK
test.t1 check status OK
DROP TABLE t1;
DROP TABLE t1;
CREATE TABLE t1 (foo GEOMETRY NOT NULL, SPATIAL INDEX(foo) );
INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(1,1)));
INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(1,0)));
INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(0,1)));
INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(0,0)));
SELECT 1 FROM t1 WHERE foo != PointFromWKB(POINT(0,0));
1
1
1
1
DROP TABLE t1;
This diff is collapsed.
Click to expand it.
mysql-test/t/gis-rtree.test
View file @
fbbaf00a
...
@@ -231,4 +231,14 @@ INSERT INTO t1 (c1) VALUES (
...
@@ -231,4 +231,14 @@ INSERT INTO t1 (c1) VALUES (
CHECK
TABLE
t1
EXTENDED
;
CHECK
TABLE
t1
EXTENDED
;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
#
# Bug #21888: Query on GEOMETRY field using PointFromWKB() results in lost connection
#
CREATE
TABLE
t1
(
foo
GEOMETRY
NOT
NULL
,
SPATIAL
INDEX
(
foo
)
);
INSERT
INTO
t1
(
foo
)
VALUES
(
PointFromWKB
(
POINT
(
1
,
1
)));
INSERT
INTO
t1
(
foo
)
VALUES
(
PointFromWKB
(
POINT
(
1
,
0
)));
INSERT
INTO
t1
(
foo
)
VALUES
(
PointFromWKB
(
POINT
(
0
,
1
)));
INSERT
INTO
t1
(
foo
)
VALUES
(
PointFromWKB
(
POINT
(
0
,
0
)));
SELECT
1
FROM
t1
WHERE
foo
!=
PointFromWKB
(
POINT
(
0
,
0
));
DROP
TABLE
t1
;
# End of 4.1 tests
# End of 4.1 tests
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