diff options
| author | Gleb Shchepa <gshchepa@mysql.com> | 2008-10-10 16:44:10 +0500 |
|---|---|---|
| committer | Gleb Shchepa <gshchepa@mysql.com> | 2008-10-10 16:44:10 +0500 |
| commit | fe3aee301ddf00af5b554e22fa0d8149ab69210c (patch) | |
| tree | 42053e3be961628b72eabdc66ac30ed492854bc3 /sql/sql_select.cc | |
| parent | ac0027ae0c65d5b3c9c00ed2a15dfca129528e23 (diff) | |
| parent | e7520c4b7ea7f4303f250636c37133be8237a2ac (diff) | |
| download | mariadb-git-fe3aee301ddf00af5b554e22fa0d8149ab69210c.tar.gz | |
automerge 5.0-bugteam --> 5.1-bugteam
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 102809f9f64..cc78bec4f99 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -9274,6 +9274,7 @@ static Field *create_tmp_field_from_item(THD *thd, Item *item, TABLE *table, */ if ((type= item->field_type()) == MYSQL_TYPE_DATETIME || type == MYSQL_TYPE_TIME || type == MYSQL_TYPE_DATE || + type == MYSQL_TYPE_NEWDATE || type == MYSQL_TYPE_TIMESTAMP || type == MYSQL_TYPE_GEOMETRY) new_field= item->tmp_table_field_from_field_type(table, 1); /* |