diff options
| author | monty@narttu.mysql.fi <> | 2007-01-27 03:46:45 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2007-01-27 03:46:45 +0200 |
| commit | 8a80e36ac3facdfba626fd758b6e4490d3ea9ddf (patch) | |
| tree | 7a54aa50f6bf549d049cd400fe056d244cfc7eb8 /sql/item_geofunc.cc | |
| parent | c022454e7c5690330ed78664443e65b3511649b8 (diff) | |
| parent | 120e3f5ee1a5f2d62f6a4ff10db0797c5ac42287 (diff) | |
| download | mariadb-git-8a80e36ac3facdfba626fd758b6e4490d3ea9ddf.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
Diffstat (limited to 'sql/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index 1b8c8d6a161..35a9f026b1d 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -701,8 +701,9 @@ double Item_func_glength::val_real() null_value= (!swkb || !(geom= Geometry::construct(&buffer, - swkb->ptr(), swkb->length())) || - geom->length(&res)); + swkb->ptr(), + swkb->length())) || + geom->geom_length(&res)); return res; } |