diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-03-29 19:20:33 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-03-29 19:20:33 +0300 |
| commit | 4430048ee8084e0fcef144e64ab89b59f8e31a71 (patch) | |
| tree | 2f2c49df3046e161d3bb656bcbed5926b5296947 /sql/sql_select.cc | |
| parent | 456cc52e9c2d981cf7094a6864cd3bef43e8cf1a (diff) | |
| parent | 08d9d182f235126c935ba27d4455eb77312521ff (diff) | |
| download | mariadb-git-4430048ee8084e0fcef144e64ab89b59f8e31a71.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B26815-5.0-opt
sql/item_sum.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 7e9b1fec12e..08780efbedb 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -8793,12 +8793,12 @@ static Field *create_tmp_field_from_item(THD *thd, Item *item, TABLE *table, enum enum_field_types type; /* - DATE/TIME fields have STRING_RESULT result type. To preserve - type they needed to be handled separately. + DATE/TIME and GEOMETRY fields have STRING_RESULT result type. + To preserve type they needed to be handled separately. */ if ((type= item->field_type()) == MYSQL_TYPE_DATETIME || type == MYSQL_TYPE_TIME || type == MYSQL_TYPE_DATE || - type == MYSQL_TYPE_TIMESTAMP) + type == MYSQL_TYPE_TIMESTAMP || type == MYSQL_TYPE_GEOMETRY) new_field= item->tmp_table_field_from_field_type(table); /* Make sure that the blob fits into a Field_varstring which has |