diff options
| author | unknown <rburnett@production.mysql.com> | 2006-08-17 22:24:35 +0200 |
|---|---|---|
| committer | unknown <rburnett@production.mysql.com> | 2006-08-17 22:24:35 +0200 |
| commit | 55fb3caeecd1a7686789a2f847039cbd7dfb355e (patch) | |
| tree | 3affab0b3d0914115f42baced334271a24d75e37 /sql/item_geofunc.cc | |
| parent | 703717c705594592be0bce8b160aeec0ec1d51ba (diff) | |
| download | mariadb-git-55fb3caeecd1a7686789a2f847039cbd7dfb355e.tar.gz | |
A couple of adjustments to the merge to fix the broken build
instance.cc:
Removed wrongly placed closing brace
item_geofunc.cc:
needed to pass in a TABLE_SHARE* instead of a TABLE*
server-tools/instance-manager/instance.cc:
Removed wrongly placed closing brace
sql/item_geofunc.cc:
needed to pass in a TABLE_SHARE* instead of a TABLE*
Diffstat (limited to 'sql/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index c5200e26cb7..ee4df8f1cfc 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -27,7 +27,7 @@ Field *Item_geometry_func::tmp_table_field(TABLE *t_arg) { - return new Field_geom(max_length, maybe_null, name, t_arg, + return new Field_geom(max_length, maybe_null, name, t_arg->s, (Field::geometry_type) get_geometry_type()); } |