diff options
| author | unknown <hf@deer.(none)> | 2004-03-17 14:04:02 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-03-17 14:04:02 +0400 |
| commit | 48121583e74f897f2b2de8e377588afb9fc41bfa (patch) | |
| tree | 4a773202af0b176453cfeb90fddc0936f389d6cd /sql/field.cc | |
| parent | 0c73b6e8d459b743676d1c1a48c0c853fddbf560 (diff) | |
| parent | e308d66aad40f2e6c2fefe953136aff7a08d8664 (diff) | |
| download | mariadb-git-48121583e74f897f2b2de8e377588afb9fc41bfa.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.233
sql/field.cc:
Auto merged
sql/opt_range.cc:
Auto merged
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index cd761004ad6..b18e4fb87a2 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -5081,7 +5081,7 @@ int Field_geom::store(const char *from, uint length, CHARSET_INFO *cs) wkb_type= uint4korr(from + WKB_HEADER_SIZE); if (wkb_type < (uint32) Geometry::wkb_point || wkb_type > (uint32) Geometry::wkb_end) - return 1; + return -1; Field_blob::store_length(length); if (table->copy_blobs || length <= MAX_FIELD_WIDTH) { // Must make a copy @@ -5094,7 +5094,7 @@ int Field_geom::store(const char *from, uint length, CHARSET_INFO *cs) err: bzero(ptr, Field_blob::pack_length()); - return 1; + return -1; } #endif /*HAVE_SPATIAL*/ |