diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-22 22:51:20 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-22 22:51:20 +0100 |
| commit | ff2e82f4a175b7b023cd167b2fa6e6fcd1bd192e (patch) | |
| tree | 63150adc067c1bb6cb476eef00094083e1a53865 /sql/spatial.cc | |
| parent | 004642525d8c4ed02686719395faf477e94cd618 (diff) | |
| parent | 3e03c9eae9089cd2cae0f378bd81ff29367f41eb (diff) | |
| download | mariadb-git-ff2e82f4a175b7b023cd167b2fa6e6fcd1bd192e.tar.gz | |
5.3 merge
Diffstat (limited to 'sql/spatial.cc')
| -rw-r--r-- | sql/spatial.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/spatial.cc b/sql/spatial.cc index b82e6977f8a..34d2417f632 100644 --- a/sql/spatial.cc +++ b/sql/spatial.cc @@ -302,7 +302,8 @@ int Geometry::create_from_opresult(Geometry_buffer *g_buf, res->q_append((char) wkb_ndr); res->q_append(geom_type); - return obj->init_from_opresult(res, rr.result(), rr.length()); + return obj->init_from_opresult(res, rr.result(), rr.length()) == 0 && + rr.length(); } |