diff options
| author | unknown <evgen@sunlight.local> | 2007-09-22 13:10:44 +0400 |
|---|---|---|
| committer | unknown <evgen@sunlight.local> | 2007-09-22 13:10:44 +0400 |
| commit | 17df0d648ca86d7074805228ba50d0f137b486d4 (patch) | |
| tree | bb0aa318c2a7fe75546f09b235ba88aff0b4483a /sql/sql_insert.cc | |
| parent | f7f10959084aa815e1e4f10b6dc02aafa9de588b (diff) | |
| parent | ebaa05efa757c475161cb5c7f0a1adcbe9f59ff3 (diff) | |
| download | mariadb-git-17df0d648ca86d7074805228ba50d0f137b486d4.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into sunlight.local:/local_work/27216-bug-5.0-opt-mysql
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index cf0016198da..d7f935268e4 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3134,7 +3134,10 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info, create_field *cr_field; Field *field, *def_field; if (item->type() == Item::FUNC_ITEM) - field= item->tmp_table_field(&tmp_table); + if (item->result_type() != STRING_RESULT) + field= item->tmp_table_field(&tmp_table); + else + field= item->tmp_table_field_from_field_type(&tmp_table); else field= create_tmp_field(thd, &tmp_table, item, item->type(), (Item ***) 0, &tmp_field, &def_field, 0, 0, 0, 0, |