diff options
| author | jani@ua141d10.elisa.omakaista.fi <> | 2005-10-31 11:54:36 +0200 |
|---|---|---|
| committer | jani@ua141d10.elisa.omakaista.fi <> | 2005-10-31 11:54:36 +0200 |
| commit | 44aea416f97a3946ee833cb91c6b2752ace730ca (patch) | |
| tree | db7782f75178512900e6e862142d57d3d0d96cf4 /sql/field.cc | |
| parent | 3612707c716b3c3460d828edd780c769bb4d8cd8 (diff) | |
| parent | 5150bd8f9f96377edb8658a3d19de1f5a91324ac (diff) | |
| download | mariadb-git-44aea416f97a3946ee833cb91c6b2752ace730ca.tar.gz | |
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/field.cc b/sql/field.cc index 36b4ec96efa..4a73d8e7981 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -7041,8 +7041,7 @@ void Field_blob::get_key_image(char *buff, uint length, imagetype type) return; } get_ptr(&blob); - gobj= Geometry::create_from_wkb(&buffer, - blob + SRID_SIZE, blob_length - SRID_SIZE); + gobj= Geometry::construct(&buffer, blob, blob_length); if (gobj->get_mbr(&mbr, &dummy)) bzero(buff, SIZEOF_STORED_DOUBLE*4); else @@ -7371,8 +7370,7 @@ void Field_geom::get_key_image(char *buff, uint length, imagetype type) return; } get_ptr(&blob); - gobj= Geometry::create_from_wkb(&buffer, - blob + SRID_SIZE, blob_length - SRID_SIZE); + gobj= Geometry::construct(&buffer, blob, blob_length); if (gobj->get_mbr(&mbr, &dummy)) bzero(buff, SIZEOF_STORED_DOUBLE*4); else @@ -7453,7 +7451,7 @@ int Field_geom::store(const char *from, uint length, CHARSET_INFO *cs) uint32 wkb_type; if (length < SRID_SIZE + WKB_HEADER_SIZE + SIZEOF_STORED_DOUBLE*2) goto err; - wkb_type= uint4korr(from + WKB_HEADER_SIZE); + wkb_type= uint4korr(from + SRID_SIZE + 1); if (wkb_type < (uint32) Geometry::wkb_point || wkb_type > (uint32) Geometry::wkb_end) goto err; |