diff options
| author | evgen@moonbone.local <> | 2007-06-11 17:02:16 +0400 |
|---|---|---|
| committer | evgen@moonbone.local <> | 2007-06-11 17:02:16 +0400 |
| commit | e1cde8aabe769af403c70842de3707a1455b8884 (patch) | |
| tree | 41d4bdbba763fca4f2a7b396da1ff50d30ad88cf /sql | |
| parent | 76f4f23f5433f538c26c84ec5b2613aa680bf261 (diff) | |
| download | mariadb-git-e1cde8aabe769af403c70842de3707a1455b8884.tar.gz | |
error_simulation.result, item.cc, subselect.result, error_simulation.test:
Post merge fix.
Diffstat (limited to 'sql')
| -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 c6d7e82cbd0..444f394f4fb 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -4403,7 +4403,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->s, + field= new Field_geom(max_length, maybe_null, name, table->s, (Field::geometry_type) ((type() == Item::TYPE_HOLDER) ? ((Item_type_holder *)this)->get_geometry_type() : |