diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2006-12-15 00:51:37 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2006-12-15 00:51:37 +0200 |
| commit | 88dd873de0d5dc6e8f262268f925596a60b58704 (patch) | |
| tree | 142bd488523fec48817d9fb2194f1a608eec00fc /sql/item_geofunc.cc | |
| parent | 601e6f4b2a78921304bc1d779991c615ee229f89 (diff) | |
| download | mariadb-git-88dd873de0d5dc6e8f262268f925596a60b58704.tar.gz | |
Fixed compiler warnings detected by option -Wshadow and -Wunused:
- Removed not used variables and functions
- Added #ifdef around code that is not used
- Renamed variables and functions to avoid conflicts
- Removed some not used arguments
Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c
I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
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 c5200e26cb7..22a4675c116 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -699,8 +699,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; } |