diff options
| author | evgen@moonbone.local <> | 2007-03-31 02:57:26 +0400 |
|---|---|---|
| committer | evgen@moonbone.local <> | 2007-03-31 02:57:26 +0400 |
| commit | bd95e76bacdede317c0cd159c4ab72bbb1d63389 (patch) | |
| tree | c5c18a6504847cea21e71c597bc36f7240948d33 /sql/item.cc | |
| parent | f470ac200062e84197b71f8f7bad268bd0588d8c (diff) | |
| download | mariadb-git-bd95e76bacdede317c0cd159c4ab72bbb1d63389.tar.gz | |
item.cc, insert_update.result:
After merge fix.
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index d4330710bbd..613b72ad05e 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -4370,7 +4370,7 @@ Field *Item::tmp_table_field_from_field_type(TABLE *table, bool fixed_length) field= new Field_blob(max_length, maybe_null, name, collation.collation); break; // Blob handled outside of case case MYSQL_TYPE_GEOMETRY: - return new Field_geom(max_length, maybe_null, name, table, + return new Field_geom(max_length, maybe_null, name, table->s, (Field::geometry_type) ((Item_geometry_func *)this)->get_geometry_type()); } |