summaryrefslogtreecommitdiff
path: root/myisam/sp_key.c
diff options
context:
space:
mode:
authorunknown <ram@mysql.r18.ru>2003-03-18 15:30:32 +0400
committerunknown <ram@mysql.r18.ru>2003-03-18 15:30:32 +0400
commit3ccd93c704556d9496b643e580dca8a9fcd2f4d4 (patch)
tree0e83c851e37727716fb38186353324ae67952771 /myisam/sp_key.c
parent1c1f407dd33951d44b4e2eaa30d4025998514e47 (diff)
downloadmariadb-git-3ccd93c704556d9496b643e580dca8a9fcd2f4d4.tar.gz
SRID support.
GeomertyFromWKB() function. SRID() function. ::store() methods for Field_geom. Code cleanup. myisam/sp_key.c: SRID support. mysql-test/r/gis.result: We should use GeometryFromWKB(). mysql-test/t/gis.test: We should use GeometryFromWKB(). sql/field.cc: SRID support. ::store() methods for Field_geom. Code cleanup. sql/field.h: SRID support. ::store() methods for Field_geom. Code cleanup. sql/item_cmpfunc.cc: SRID support. Code cleanup. sql/item_create.cc: Code cleanup. sql/item_create.h: Code cleanup. sql/item_func.cc: SRID support. Code cleanup. sql/item_func.h: SRID support. sql/item_strfunc.cc: SRID support. GeometryFromWKB() function. Code cleanup. sql/item_strfunc.h: SRID support. GeometryFromWKB() function. Code cleanup. sql/lex.h: GeometryFromWKB() function. SRID() function. sql/spatial.cc: Code cleanup. sql/spatial.h: Code cleanup. sql/sql_yacc.yy: Fix for xxxFromText() functions. GeometryFromWKB() function.
Diffstat (limited to 'myisam/sp_key.c')
-rw-r--r--myisam/sp_key.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/sp_key.c b/myisam/sp_key.c
index 82c2b1f8510..f0b53b541b8 100644
--- a/myisam/sp_key.c
+++ b/myisam/sp_key.c
@@ -47,7 +47,7 @@ uint sp_make_key(register MI_INFO *info, uint keynr, uchar *key,
dlen = _mi_calc_blob_length(keyseg->bit_start, pos);
memcpy_fixed(&dptr, pos + keyseg->bit_start, sizeof(char*));
- sp_mbr_from_wkb(dptr, dlen, SPDIMS, mbr);
+ sp_mbr_from_wkb(dptr + 4, dlen - 4, SPDIMS, mbr); /* SRID */
for (i = 0, keyseg = keyinfo->seg; keyseg->type; keyseg++, i++)
{