diff options
| author | unknown <malff@lambda.weblab> | 2007-10-29 08:07:27 -0600 |
|---|---|---|
| committer | unknown <malff@lambda.weblab> | 2007-10-29 08:07:27 -0600 |
| commit | f139033063f0af6b5df61c729b5a2a6406f28a64 (patch) | |
| tree | 8cb30784f49f514d565af5f0167c78d63cd9d4b3 /sql/item_geofunc.cc | |
| parent | 08edbe4ea13fe8d547a646901b36d497e67f9531 (diff) | |
| parent | 7d9c59b7be412210413fc93602ec4522eb1f368b (diff) | |
| download | mariadb-git-f139033063f0af6b5df61c729b5a2a6406f28a64.tar.gz | |
Merge lambda.weblab:/home/malff/TREE/mysql-5.1-base
into lambda.weblab:/home/malff/TREE/mysql-5.1-rt-merge
mysql-test/include/mix1.inc:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/select.result:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/protocol.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index 78741483c0b..332e88c950d 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -28,7 +28,7 @@ Field *Item_geometry_func::tmp_table_field(TABLE *t_arg) { Field *result; if ((result= new Field_geom(max_length, maybe_null, name, t_arg->s, - (Field::geometry_type) get_geometry_type()))) + get_geometry_type()))) result->init(t_arg); return result; } @@ -41,10 +41,6 @@ void Item_geometry_func::fix_length_and_dec() maybe_null= 1; } -int Item_geometry_func::get_geometry_type() const -{ - return (int)Field::GEOM_GEOMETRY; -} String *Item_func_geometry_from_text::val_str(String *str) { @@ -163,9 +159,9 @@ String *Item_func_geometry_type::val_str(String *str) } -int Item_func_envelope::get_geometry_type() const +Field::geometry_type Item_func_envelope::get_geometry_type() const { - return (int) Field::GEOM_POLYGON; + return Field::GEOM_POLYGON; } @@ -193,9 +189,9 @@ String *Item_func_envelope::val_str(String *str) } -int Item_func_centroid::get_geometry_type() const +Field::geometry_type Item_func_centroid::get_geometry_type() const { - return (int) Field::GEOM_POINT; + return Field::GEOM_POINT; } @@ -333,9 +329,9 @@ err: */ -int Item_func_point::get_geometry_type() const +Field::geometry_type Item_func_point::get_geometry_type() const { - return (int) Field::GEOM_POINT; + return Field::GEOM_POINT; } |